summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-04-10 13:58:46 (GMT)
committerBrad King <brad.king@kitware.com>2019-04-10 14:01:19 (GMT)
commit06dab0f0e5dcef89a0d03c4fd395a13a99056ea4 (patch)
tree4d5d2021e08644e811c7a719a003b9c6062d0400
parent784c35b4445ca4ecf5a6aad859bd3724cdb49ff6 (diff)
downloadCMake-06dab0f0e5dcef89a0d03c4fd395a13a99056ea4.zip
CMake-06dab0f0e5dcef89a0d03c4fd395a13a99056ea4.tar.gz
CMake-06dab0f0e5dcef89a0d03c4fd395a13a99056ea4.tar.bz2
Tests: Fix Qt*Autogen.GlobalAutogenTarget to use matching generator
Build the GAT project with the same generator as the rest of the test. This was accidentally left out of commit 8c8731b422 (Autogen: Add test for CMAKE_GLOBAL_AUTOGEN/RCC_TARGET, 2018-11-11, v3.14.0-rc1~396^2~2).
-rw-r--r--Tests/QtAutogen/GlobalAutogenTarget/CMakeLists.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Tests/QtAutogen/GlobalAutogenTarget/CMakeLists.txt b/Tests/QtAutogen/GlobalAutogenTarget/CMakeLists.txt
index cff7022..81fd8db 100644
--- a/Tests/QtAutogen/GlobalAutogenTarget/CMakeLists.txt
+++ b/Tests/QtAutogen/GlobalAutogenTarget/CMakeLists.txt
@@ -69,6 +69,9 @@ file(MAKE_DIRECTORY ${GAT_BDIR})
message("___ Configuring GAT project ___")
execute_process(
COMMAND "${CMAKE_COMMAND}" "${GAT_SDIR}"
+ -G "${CMAKE_GENERATOR}"
+ -A "${CMAKE_GENERATOR_PLATFORM}"
+ -T "${CMAKE_GENERATOR_TOOLSET}"
"-DQT_TEST_VERSION=${QT_TEST_VERSION}"
"-DCMAKE_AUTOGEN_VERBOSE=${CMAKE_AUTOGEN_VERBOSE}"
"-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}"