feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake build: Some clean up for macOS

Browse Source 
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>
This commit is contained in:
Eike Ziller
2020-01-24 12:14:38 +01:00
parent 866f3aeb4a
commit bc4fd14ee4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/CMakeLists.txt
View File

@@ -1 +1,3 @@
install(PROGRAMS qtcreator.sh DESTINATION bin)
if (NOT APPLE)
install(PROGRAMS qtcreator.sh DESTINATION bin)
endif()

4
cmake/QtCreatorAPI.cmake
View File

@@ -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")