diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-03-23 17:54:06 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-04-06 10:59:27 +0000 |
| commit | 4b3a7463328b657650da873cd485bfd5ced9c247 (patch) | |
| tree | da6ae4f228b30365fc0a6bcfcc68af03cfb4041f /src/CMakeLists.txt | |
| parent | 16cb026b8bfd8ff25643c7bc1f552c550773d6e5 (diff) | |
CMake build: Fix remaining issues with Devel package
On Linux (and Windows) we should not create toplevel files (README.md
etc) or directories (doc/, scripts/ etc).
On macOS, move the whole Devel package contents into the app bundle,
because that is installed toplevel in the Qt installers, and we
shouldn't even create include/, lib/ or any other directory at the
toplevel at all.
Since the prefix path must now point to the Resources folder inside the
app bundle, adapt build_plugin.py to also accept --qtc-path pointing to
the app bundle (Qt Creator.app) itself, and also to the app bundles
parent directory. Adapt the Qt Creator plugin project template
similarly.
Task-number: QTCREATORBUG-25414
Fixes: QTCREATORBUG-25415
Change-Id: Ic756237fb920b54b1ec95d076649ad947b39a7e8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f822331965..799d8ef68c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,7 @@ add_library(app_version INTERFACE) target_include_directories(app_version INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> - INTERFACE $<INSTALL_INTERFACE:include/src>) + INTERFACE $<INSTALL_INTERFACE:${IDE_HEADER_INSTALL_PATH}/src>) install(TARGETS app_version EXPORT QtCreator) add_subdirectory(libs) @@ -16,20 +16,20 @@ install( ${PROJECT_SOURCE_DIR}/HACKING ${PROJECT_SOURCE_DIR}/LICENSE.GPL3-EXCEPT ${PROJECT_SOURCE_DIR}/README.md - DESTINATION ./ + DESTINATION ${IDE_DATA_PATH} COMPONENT Devel EXCLUDE_FROM_ALL ) install( DIRECTORY ${PROJECT_SOURCE_DIR}/scripts - DESTINATION ./ + DESTINATION ${IDE_DATA_PATH} COMPONENT Devel EXCLUDE_FROM_ALL USE_SOURCE_PERMISSIONS ) install(EXPORT QtCreator - DESTINATION "lib/cmake/QtCreator" + DESTINATION ${IDE_CMAKE_INSTALL_PATH}/QtCreator COMPONENT Devel EXCLUDE_FROM_ALL NAMESPACE QtCreator:: FILE QtCreatorTargets.cmake @@ -106,6 +106,6 @@ install( ${PROJECT_SOURCE_DIR}/cmake/QtcSeparateDebugInfo.cmake ${PROJECT_SOURCE_DIR}/cmake/QtcSeparateDebugInfo.Info.plist.in ${CMAKE_BINARY_DIR}/cmake/QtCreatorConfig.cmake - DESTINATION lib/cmake/QtCreator + DESTINATION ${IDE_CMAKE_INSTALL_PATH}/QtCreator COMPONENT Devel EXCLUDE_FROM_ALL ) |