diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-17 18:22:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-17 18:22:40 (GMT) |
| commit | 6d7621baeaaf4e19322480484b33f9ca95e6c75e (patch) | |
| tree | b2edc5d55d789617f7378ce2d6efe330845effe9 /Tests/RunCMake | |
| parent | 215bd0e72b48b2fb2b8e62a53765a60064d7b4b0 (diff) | |
| parent | 20e4db4a6671ef2c39863d08fc5513848c1a07b6 (diff) | |
| download | CMake-6d7621baeaaf4e19322480484b33f9ca95e6c75e.zip CMake-6d7621baeaaf4e19322480484b33f9ca95e6c75e.tar.gz CMake-6d7621baeaaf4e19322480484b33f9ca95e6c75e.tar.bz2 | |
Merge topic 'qt-autogen-per-config'
20e4db4a66 cmGeneratorTarget: Make GetConfigCommonSourceFiles Xcode-specific
92d7b456e5 Autogen: Add support for per-config sources
3ffebbaefb Tests/QtAutogen: Forward build configuration in multi-config generators
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5624
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/NinjaMultiConfig/Qt5.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/RunCMake/NinjaMultiConfig/Qt5.cmake b/Tests/RunCMake/NinjaMultiConfig/Qt5.cmake index 3a1c7f5..578256a 100644 --- a/Tests/RunCMake/NinjaMultiConfig/Qt5.cmake +++ b/Tests/RunCMake/NinjaMultiConfig/Qt5.cmake @@ -16,12 +16,13 @@ if(Qt5Core_VERSION VERSION_GREATER_EQUAL "5.15.0") set(moc_writes_depfiles 1) endif() -set(autogen_files "${CMAKE_BINARY_DIR}/exe_autogen/mocs_compilation.cpp") +set(autogen_files) if(moc_writes_depfiles) list(APPEND autogen_files "${CMAKE_BINARY_DIR}/exe_autogen/deps") list(APPEND autogen_files "${CMAKE_BINARY_DIR}/exe_autogen/timestamp") endif() foreach(c IN LISTS CMAKE_CONFIGURATION_TYPES) + list(APPEND autogen_files "${CMAKE_BINARY_DIR}/exe_autogen/mocs_compilation_${c}.cpp") list(APPEND autogen_files "${CMAKE_BINARY_DIR}/exe_autogen/include_${c}/moc_qt5.cpp") if(moc_writes_depfiles) list(APPEND autogen_files "${CMAKE_BINARY_DIR}/exe_autogen/include_${c}/moc_qt5.cpp.d") |