Commit a11ea1a9 authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'fix-refactor-generator-configs' into release-3.19

b9cb1d32 Fix regression in test/install/package configuration selection
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !5381
parents b1d9a25f b9cb1d32
......@@ -3401,10 +3401,9 @@ std::vector<std::string> cmMakefile::GetGeneratorConfigs(
GeneratorConfigQuery mode) const
{
std::vector<std::string> configs;
if (this->GetGlobalGenerator()->IsMultiConfig() ||
mode == cmMakefile::OnlyMultiConfig) {
if (this->GetGlobalGenerator()->IsMultiConfig()) {
this->GetDefExpandList("CMAKE_CONFIGURATION_TYPES", configs);
} else {
} else if (mode != cmMakefile::OnlyMultiConfig) {
const std::string& buildType = this->GetSafeDefinition("CMAKE_BUILD_TYPE");
if (!buildType.empty()) {
configs.emplace_back(buildType);
......
......@@ -27,3 +27,14 @@ function(run_TestfileErrors)
run_cmake_command(TestfileErrors-test ${CMAKE_CTEST_COMMAND} -C Debug)
endfunction()
run_TestfileErrors()
function(run_SingleConfig)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/SingleConfig-build)
run_cmake(SingleConfig)
set(RunCMake_TEST_NO_CLEAN 1)
run_cmake_command(SingleConfig-build ${CMAKE_COMMAND} --build .)
run_cmake_command(SingleConfig-test ${CMAKE_CTEST_COMMAND}) # No -C Debug required for single-config.
endfunction()
if(NOT RunCMake_GENERATOR_IS_MULTI_CONFIG)
run_SingleConfig()
endif()
^Test project [^
]*/Tests/RunCMake/CTest/SingleConfig-build
Start 1: SingleConfig
1/1 Test #1: SingleConfig \.+ +Passed +[0-9.]+ sec
+
100% tests passed, 0 tests failed out of 1
+
Total Test time \(real\) = +[0-9.]+ sec$
include(CTest)
# This should be ignored by single-config generators.
set(CMAKE_CONFIGURATION_TYPES "Release;Debug" CACHE INTERNAL "Supported configuration types")
add_test(NAME SingleConfig COMMAND ${CMAKE_COMMAND} -E echo SingleConfig)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment