diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-20 20:37:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-12-16 15:09:09 (GMT) |
| commit | 3ffebbaefb876f40c2d2751b58800cacf4951407 (patch) | |
| tree | 1a36641e0aa7956c5e860f8f1ab593eddd052d0d /Tests | |
| parent | 34469a4f71c523488682661aafc8d13b054ed5b9 (diff) | |
| download | CMake-3ffebbaefb876f40c2d2751b58800cacf4951407.zip CMake-3ffebbaefb876f40c2d2751b58800cacf4951407.tar.gz CMake-3ffebbaefb876f40c2d2751b58800cacf4951407.tar.bz2 | |
Tests/QtAutogen: Forward build configuration in multi-config generators
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/QtAutogen/TestMacros.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Tests/QtAutogen/TestMacros.cmake b/Tests/QtAutogen/TestMacros.cmake index 0e27188..89b00d7 100644 --- a/Tests/QtAutogen/TestMacros.cmake +++ b/Tests/QtAutogen/TestMacros.cmake @@ -1,6 +1,8 @@ # Autogen build options set(Autogen_BUILD_OPTIONS "-DQT_TEST_VERSION=${QT_TEST_VERSION}") -if(NOT _isMultiConfig) # Set in Tests/CMakeLists.txt +if(_isMultiConfig) # Set in Tests/CMakeLists.txt + list(APPEND Autogen_CTEST_OPTIONS --build-config $<CONFIGURATION>) +else() list(APPEND Autogen_BUILD_OPTIONS "-DCMAKE_BUILD_TYPE=$<CONFIGURATION>") endif() list(APPEND Autogen_BUILD_OPTIONS @@ -30,6 +32,7 @@ macro(ADD_AUTOGEN_TEST NAME) "${_BuildDir}" ${build_generator_args} --build-project ${NAME} + ${Autogen_CTEST_OPTIONS} --build-exe-dir "${_BuildDir}" --force-new-ctest-process --build-options ${build_options} ${Autogen_BUILD_OPTIONS} |