diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-22 11:19:39 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-11-22 11:26:28 -0500 |
| commit | 80fc564dd7cbebc374a18fb57c71472dac5de6c1 (patch) | |
| tree | ed2af4b1fc85a3c4c36cdd77cca2e43d276ed065 | |
| parent | 0a802d0f9ef2b0a0150382d6e988f5d2a78eeb64 (diff) | |
| download | cmake-80fc564dd7cbebc374a18fb57c71472dac5de6c1.tar.gz | |
try_compile: Restore COPY_FILE with CMAKE_TRY_COMPILE_CONFIGURATION
Since commit 0c141b0393 (try_compile: Record output location instead of
reverse computing it, 2022-08-31, v3.25.0-rc1~154^2) we always look for
the "Debug" configuration's output binary from the test project.
Restore looking for the `CMAKE_TRY_COMPILE_CONFIGURATION`.
Fixes: #24180
| -rw-r--r-- | Source/cmCoreTryCompile.cxx | 15 | ||||
| -rw-r--r-- | Tests/RunCMake/try_compile/CopyFileConfig.cmake | 8 | ||||
| -rw-r--r-- | Tests/RunCMake/try_compile/old_and_new_signature_tests.cmake | 1 |
3 files changed, 20 insertions, 4 deletions
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index 867f984fd2..b44111d6de 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -206,6 +206,8 @@ auto const TryRunSourcesArgParser = auto const TryRunOldArgParser = makeTryRunParser(TryCompileOldArgParser); #undef BIND_LANG_PROPS + +std::string const TryCompileDefaultConfig = "DEBUG"; } Arguments cmCoreTryCompile::ParseArgs( @@ -706,9 +708,9 @@ bool cmCoreTryCompile::TryCompileCode(Arguments& arguments, CM_FALLTHROUGH; case cmPolicies::NEW: { // NEW behavior is to pass config-specific compiler flags. - static std::string const cfgDefault = "DEBUG"; - std::string const cfg = - !tcConfig.empty() ? cmSystemTools::UpperCase(tcConfig) : cfgDefault; + std::string const cfg = !tcConfig.empty() + ? cmSystemTools::UpperCase(tcConfig) + : TryCompileDefaultConfig; for (std::string const& li : testLangs) { std::string const langFlagsCfg = cmStrCat("CMAKE_", li, "_FLAGS_", cfg); @@ -1199,7 +1201,12 @@ void cmCoreTryCompile::FindOutputFile(const std::string& targetName) tmpOutputFile += targetName; if (this->Makefile->GetGlobalGenerator()->IsMultiConfig()) { - tmpOutputFile += "_DEBUG"; + std::string const tcConfig = + this->Makefile->GetSafeDefinition("CMAKE_TRY_COMPILE_CONFIGURATION"); + std::string const cfg = !tcConfig.empty() + ? cmSystemTools::UpperCase(tcConfig) + : TryCompileDefaultConfig; + tmpOutputFile = cmStrCat(tmpOutputFile, '_', cfg); } tmpOutputFile += "_loc"; diff --git a/Tests/RunCMake/try_compile/CopyFileConfig.cmake b/Tests/RunCMake/try_compile/CopyFileConfig.cmake new file mode 100644 index 0000000000..22d20b7ff5 --- /dev/null +++ b/Tests/RunCMake/try_compile/CopyFileConfig.cmake @@ -0,0 +1,8 @@ +enable_language(C) +set(CMAKE_TRY_COMPILE_CONFIGURATION Release) + +include(${CMAKE_CURRENT_SOURCE_DIR}/${try_compile_DEFS}) +try_compile(RESULT + ${try_compile_bindir_or_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/src.c + COPY_FILE "${CMAKE_CURRENT_BINARY_DIR}/out.bin" + ) diff --git a/Tests/RunCMake/try_compile/old_and_new_signature_tests.cmake b/Tests/RunCMake/try_compile/old_and_new_signature_tests.cmake index ac07ad32e5..3158e327fb 100644 --- a/Tests/RunCMake/try_compile/old_and_new_signature_tests.cmake +++ b/Tests/RunCMake/try_compile/old_and_new_signature_tests.cmake @@ -23,6 +23,7 @@ run_cmake(TryRunArgs) run_cmake(BuildType) run_cmake(BuildTypeAsFlag) run_cmake(OutputDirAsFlag) +run_cmake(CopyFileConfig) run_cmake(EnvConfig) |