diff options
| author | Orkun Tokdemir <ilhanorkuntokdemir@gmail.com> | 2023-05-25 15:34:35 (GMT) |
|---|---|---|
| committer | Orkun Tokdemir <ilhanorkuntokdemir@gmail.com> | 2023-05-27 10:55:21 (GMT) |
| commit | 2bb3d9b6448efd2aab4db3e33a16b22a1b1b097f (patch) | |
| tree | 39069259af567b047142846e0f9b05b02990115c /Tests | |
| parent | 3bd605f3d06b8ac39f517b5a105c5254ca3ec12b (diff) | |
| download | CMake-2bb3d9b6448efd2aab4db3e33a16b22a1b1b097f.zip CMake-2bb3d9b6448efd2aab4db3e33a16b22a1b1b097f.tar.gz CMake-2bb3d9b6448efd2aab4db3e33a16b22a1b1b097f.tar.bz2 | |
Autogen: Fix multi-config generated file issue
The default config was an empty string when a `multi-config`
generator is used. An if check was added for those situations.
If a source file has a specific config configuration,
it is used with `$<CONFIG>` in the `multi-config` generator usage.
Fixes: #24848
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/Autogen/MocGeneratedFile.cmake | 15 | ||||
| -rw-r--r-- | Tests/RunCMake/Autogen/RunCMakeTest.cmake | 19 |
2 files changed, 34 insertions, 0 deletions
diff --git a/Tests/RunCMake/Autogen/MocGeneratedFile.cmake b/Tests/RunCMake/Autogen/MocGeneratedFile.cmake new file mode 100644 index 0000000..7bb55e9 --- /dev/null +++ b/Tests/RunCMake/Autogen/MocGeneratedFile.cmake @@ -0,0 +1,15 @@ +enable_language(CXX) + +find_package(Qt${with_qt_version} REQUIRED COMPONENTS Core) + +set(CMAKE_AUTOMOC ON) + +set(GEN_SRC "class_$<CONFIG>.cpp") +add_custom_command( + OUTPUT "${GEN_SRC}" + COMMAND ${CMAKE_COMMAND} -E echo "// cpp src" > "${GEN_SRC}" + VERBATIM +) + +add_library(libgen STATIC ${GEN_SRC}) +target_link_libraries(libgen Qt${with_qt_version}::Core) diff --git a/Tests/RunCMake/Autogen/RunCMakeTest.cmake b/Tests/RunCMake/Autogen/RunCMakeTest.cmake index 97b64ed..4fe9406 100644 --- a/Tests/RunCMake/Autogen/RunCMakeTest.cmake +++ b/Tests/RunCMake/Autogen/RunCMakeTest.cmake @@ -103,4 +103,23 @@ if (DEFINED with_qt_version) endblock() endif() endif() + + if(RunCMake_GENERATOR_IS_MULTI_CONFIG AND NOT RunCMake_GENERATOR MATCHES "Xcode") + block() + set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/MocGeneratedFile-build) + run_cmake(MocGeneratedFile) + set(RunCMake_TEST_NO_CLEAN 1) + run_cmake_command(MocGeneratedFile-build ${CMAKE_COMMAND} --build . --config Debug --verbose) + endblock() + if(RunCMake_GENERATOR MATCHES "Ninja Multi-Config") + block() + set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/MocGeneratedFile-cross-config-build) + list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_CROSS_CONFIGS=all) + run_cmake(MocGeneratedFile) + set(RunCMake_TEST_NO_CLEAN 1) + run_cmake_command(MocGeneratedFile-cross-config-build ${CMAKE_COMMAND} --build . --config Release --target libgen:Debug) + run_cmake_command(MocGeneratedFile-cross-config-build ${CMAKE_COMMAND} --build . --config Debug --target libgen:Release) + endblock() + endif() + endif() endif () |