mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-09 15:20:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression on reconfigure with unnormalized -DCMAKE_<LANG>_COMPILER=

Browse Source 
Since commit 3f2a5971c0 (Modules: CMAKE_*_COMPILER convert path to cmake
path, 2023-12-02, v3.29.0-rc1~292^2) we normalize the path to the
compiler.  Update our logic that checks whether the compiler has changed
to account for path normalization.

Fixes: #25883
Issue: #25456
This commit is contained in:
Brad King
2024-04-10 12:03:17 -04:00
parent 1d485a8b45
commit 26e79ed299
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmGlobalGenerator.cxx
View File

@@ -28,6 +28,7 @@
#include "cm_codecvt_Encoding.hxx"
#include "cmAlgorithms.h"
#include "cmCMakePath.h"
#include "cmCPackPropertiesGenerator.h"
#include "cmComputeTargetDepends.h"
#include "cmCryptoHash.h"
@@ -270,17 +271,14 @@ void cmGlobalGenerator::ResolveLanguageCompiler(const std::string& lang,
std::string changeVars;
if (cname && !optional) {
std::string cnameString;
cmCMakePath cachedPath;
if (!cmSystemTools::FileIsFullPath(*cname)) {
cnameString = cmSystemTools::FindProgram(*cname);
cachedPath = cmSystemTools::FindProgram(*cname);
} else {
cnameString = *cname;
cachedPath = *cname;
}
std::string pathString = path;
// get rid of potentially multiple slashes:
cmSystemTools::ConvertToUnixSlashes(cnameString);
cmSystemTools::ConvertToUnixSlashes(pathString);
if (cnameString != pathString) {
cmCMakePath foundPath = path;
if (foundPath.Normal() != cachedPath.Normal()) {
cmValue cvars = this->GetCMakeInstance()->GetState()->GetGlobalProperty(
"__CMAKE_DELETE_CACHE_CHANGE_VARS_");
if (cvars) {

2
Tests/RunCMake/CompilerChange/CompilerPath-stdout.txt Normal file
View File

@@ -0,0 +1,2 @@
-- CMAKE_C_COMPILER is '[^']*/Tests/RunCMake/CompilerChange/cc1.sh'
-- CACHE_ENTRY='cached'

3
Tests/RunCMake/CompilerChange/CompilerPath.cmake Normal file
View File

@@ -0,0 +1,3 @@
enable_language(C)
message(STATUS "CMAKE_C_COMPILER is '${CMAKE_C_COMPILER}'")
message(STATUS "CACHE_ENTRY='${CACHE_ENTRY}'")

10
Tests/RunCMake/CompilerChange/RunCMakeTest.cmake
View File

@@ -35,3 +35,13 @@ block()
set(ENV{RunCMake_TEST} "EmptyCompiler")
run_cmake_with_options(EmptyCompiler -DCMAKE_C_COMPILER=)
endblock()
block()
set(cc1_dot ${RunCMake_BINARY_DIR}/./cc1.sh)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/CompilerPath-build)
set(RunCMake_TEST_VARIANT_DESCRIPTION "-step1")
run_cmake_with_options(CompilerPath "-DCMAKE_C_COMPILER=${cc1_dot}" -DCACHE_ENTRY=cached)
set(RunCMake_TEST_NO_CLEAN 1)
set(RunCMake_TEST_VARIANT_DESCRIPTION "-step2")
run_cmake_with_options(CompilerPath "-DCMAKE_C_COMPILER=${cc1_dot}")
endblock()