mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-22 22:51:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tests/QtAutogen: Forward build configuration in multi-config generators

Browse Source
This commit is contained in:
Brad King
2020-10-20 16:37:47 -04:00
parent 34469a4f71
commit 3ffebbaefb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Tests/QtAutogen/TestMacros.cmake
View File

@@ -1,6 +1,8 @@
# Autogen build options # Autogen build options
set(Autogen_BUILD_OPTIONS "-DQT_TEST_VERSION=${QT_TEST_VERSION}") 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>") list(APPEND Autogen_BUILD_OPTIONS "-DCMAKE_BUILD_TYPE=$<CONFIGURATION>")
endif() endif()
list(APPEND Autogen_BUILD_OPTIONS list(APPEND Autogen_BUILD_OPTIONS
@@ -30,6 +32,7 @@ macro(ADD_AUTOGEN_TEST NAME)
"${_BuildDir}" "${_BuildDir}"
${build_generator_args} ${build_generator_args}
--build-project ${NAME} --build-project ${NAME}
${Autogen_CTEST_OPTIONS}
--build-exe-dir "${_BuildDir}" --build-exe-dir "${_BuildDir}"
--force-new-ctest-process --force-new-ctest-process
--build-options ${build_options} ${Autogen_BUILD_OPTIONS} --build-options ${build_options} ${Autogen_BUILD_OPTIONS}