summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2020-01-24 12:14:38 +0100
committerEike Ziller <eike.ziller@qt.io>2020-01-24 11:43:27 +0000
commitbc4fd14ee4af6edb08f0852bb6bfc6b82559237a (patch)
tree6ab4a3febf3d57670e56ce80d4a29b5c2dbcbd56 /cmake
parent866f3aeb4ad20299e482b76bd94f062ef93c7e9e (diff)
downloadqt-creator-bc4fd14ee4af6edb08f0852bb6bfc6b82559237a.tar.gz
CMake build: Some clean up for macOS
Don't install qtcreator.sh, it cannot be used. Don't install application into bin/ subfolder. App-bundles do not follow the UNIX bin/, lib/, share/ convention, so don't even try. (This makes bundling it into a 7z consistent with what we do on the other platforms.) Change-Id: Ib3faa2909a9b30a11193586f279528f1b8bd96fa Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtCreatorAPI.cmake4
1 files changed, 2 insertions, 2 deletions
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")