From bc4fd14ee4af6edb08f0852bb6bfc6b82559237a Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 24 Jan 2020 12:14:38 +0100 Subject: [PATCH] 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 --- bin/CMakeLists.txt | 4 +++- cmake/QtCreatorAPI.cmake | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index 60b1bb7d359..3c5d2a1c95b 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 4e8fe200b41..e03d34f92fd 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")