diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2024-01-19 18:00:45 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2024-01-19 17:01:28 +0000 |
| commit | 108d26eadf66abb8cc44e8aa431c960ab4b8dd06 (patch) | |
| tree | e4de779fadbc217ffb124f07154d11ce1e33c82f | |
| parent | 2a18bc14c43d56213075a1b8dc8e55901dedb2f4 (diff) | |
| parent | a8dd663a70314f3f83cd085c4f559d7b42aa615a (diff) | |
Merge remote-tracking branch 'origin/qds/dev'v13.0.0-beta1
Change-Id: I5ce4417e0fc8fedb855c7374eb6283464dc8500d
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b9849c..99295e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,18 +4,20 @@ project(plugin-telemetry) include(ExternalProject) -# Set common CMAKE_PREFIX_PATH/ CMAKE_PREFIX_PATH_ALT_SEP -# that can be forwarded to external projects list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_BINARY_DIR}/extra-cmake-modules ${CMAKE_CURRENT_BINARY_DIR}/kuserfeedback) -string(REPLACE ";" "|" CMAKE_PREFIX_PATH_ALT_SEP "${CMAKE_PREFIX_PATH}") +string(REPLACE ";" "$<SEMICOLON>" CMAKE_PREFIX_PATH_MASKED_SEMICOLON "${CMAKE_PREFIX_PATH}") +if(CMAKE_OSX_ARCHITECTURES) + string(REPLACE ";" "$<SEMICOLON>" CMAKE_OSX_ARCHITECTURES_MASKED_SEMICOLON "-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}") +endif() ExternalProject_Add(extra-cmake-modules PREFIX extra-cmake-modules SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/extra-cmake-modules" CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/extra-cmake-modules + "${CMAKE_OSX_ARCHITECTURES_MASKED_SEMICOLON}" ) set(KUSERFEEDBACK_COMPONENTS @@ -39,8 +41,9 @@ ExternalProject_Add(kuserfeedback ${KUSERFEEDBACK_COMPONENTS} -DKDE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_ALT_SEP} + -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_MASKED_SEMICOLON} -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/kuserfeedback + "${CMAKE_OSX_ARCHITECTURES_MASKED_SEMICOLON}" DEPENDS extra-cmake-modules ) @@ -63,10 +66,11 @@ ExternalProject_Add(plugin -DUSP_AUTH_KEY=${USP_AUTH_KEY} -DUSP_SERVER_URL=${USP_SERVER_URL} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_ALT_SEP} + -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_MASKED_SEMICOLON} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DQtCreator_BINARY_DIR:PATH=${QtCreator_BINARY_DIR} -DQTC_MERGE_BINARY_DIR:BOOL=${QTC_MERGE_BINARY_DIR} + "${CMAKE_OSX_ARCHITECTURES_MASKED_SEMICOLON}" DEPENDS kuserfeedback QtCreator::Core QtCreator::Debugger QtCreator::ProjectExplorer QtCreator::QtSupport BUILD_ALWAYS ON ) |