aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2020-04-28 13:11:28 +0200
committerEike Ziller <eike.ziller@qt.io>2020-04-29 06:34:54 +0000
commit544986e8e617ba96d48ef4a32bcad72702bcf7ac (patch)
treebd2eb1f9f83607d562b172a3759dca399eacddcd
parent4b4c39b5652148600219eac54cfc8dedd3afa963 (diff)
Pass compiler to subprojectsv4.12.4v4.12.3v4.12.2v4.12.14.12
We explicitly pass "cl" as the compiler to the plugin build, because CMake otherwise detects GCC from Strawberry Perl. We need to pass that on to the subprojects. Task-number: QTCREATORBUG-23914 Change-Id: I26fe35e187300cefa0cf94fba33377caa6a639d0 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r--CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 895425d..c7a4d5c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,8 @@ ExternalProject_Add(kuserfeedback
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_ALT_SEP}
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/kuserfeedback
+ "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
+ "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
DEPENDS extra-cmake-modules
)
@@ -59,5 +61,7 @@ ExternalProject_Add(plugin
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_ALT_SEP}
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+ "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}"
+ "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"
DEPENDS kuserfeedback
)