summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-04-11 14:12:16 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-04-11 14:13:47 (GMT)
commita550e2d6e48798d342a5ba7436013c6aa6ce5151 (patch)
treecd12707a90e6303ee05c2ee316839e071e7b556d
parent5ae15061c36f45551d0308a5ff916067970705ff (diff)
parent06dab0f0e5dcef89a0d03c4fd395a13a99056ea4 (diff)
downloadCMake-a550e2d6e48798d342a5ba7436013c6aa6ce5151.zip
CMake-a550e2d6e48798d342a5ba7436013c6aa6ce5151.tar.gz
CMake-a550e2d6e48798d342a5ba7436013c6aa6ce5151.tar.bz2
Merge topic 'test-autogen-GAT-generator'
06dab0f0e5 Tests: Fix Qt*Autogen.GlobalAutogenTarget to use matching generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3210
-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}"