diff options
-rw-r--r-- | bin/CMakeLists.txt | 4 | ||||
-rw-r--r-- | cmake/QtCreatorAPI.cmake | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index 60b1bb7d35..3c5d2a1c95 100644 --- a/bin/CMakeLists.txt +++ b/bin/CMakeLists.txt @@ -1 +1,3 @@ -install(PROGRAMS qtcreator.sh DESTINATION bin) +if (NOT APPLE) + install(PROGRAMS qtcreator.sh DESTINATION bin) +endif() diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 4e8fe200b4..e03d34f92f 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -28,9 +28,8 @@ endif() # Setup path handling # -set(_IDE_APP_PATH "bin") - if (APPLE) + set(_IDE_APP_PATH ".") set(_IDE_APP_TARGET "${IDE_DISPLAY_NAME}") set(_IDE_OUTPUT_PATH "${_IDE_APP_PATH}/${_IDE_APP_TARGET}.app/Contents") @@ -43,6 +42,7 @@ if (APPLE) set(_IDE_DOC_PATH "${_IDE_OUTPUT_PATH}/Resources/doc") set(_IDE_BIN_PATH "${_IDE_OUTPUT_PATH}/MacOS") else () + set(_IDE_APP_PATH "bin") set(_IDE_APP_TARGET "${IDE_ID}") set(_IDE_LIBRARY_BASE_PATH "lib") |