mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 12:49:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'compiler-path-normalization'

Browse Source 
26e79ed299 Fix regression on reconfigure with unnormalized -DCMAKE_<LANG>_COMPILER=
1d485a8b45 Tests/RunCMake/CompilerChange: Simplify test cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Ashay Rane <ashay.r@gmail.com>
Merge-request: !9416
This commit is contained in:
Brad King
2024-04-11 12:35:24 +00:00
committed by Kitware Robot
parent 99167337f3 26e79ed299
commit fbd1091d8b
10 changed files with 40 additions and 46 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}'")

3
Tests/RunCMake/CompilerChange/EmptyCompiler-override.cmake
View File

@@ -1,2 +1 @@
message(STATUS "CMAKE_C_COMPILER is \"${CMAKE_C_COMPILER}\"")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cc.cmake" "set(CMAKE_C_COMPILER \"${CMAKE_C_COMPILER}\")\n")
message(STATUS "CMAKE_C_COMPILER is '${CMAKE_C_COMPILER}'")

3
Tests/RunCMake/CompilerChange/EmptyCompiler-stdout.txt Normal file
View File

@@ -0,0 +1,3 @@
-- CMAKE_C_COMPILER is '[^']*/Tests/RunCMake/CompilerChange/cc2.sh'
.*
-- CMAKE_C_COMPILER is 'CMAKE_C_COMPILER-NOTFOUND'

2
Tests/RunCMake/CompilerChange/FirstCompiler-stdout.txt
View File

@@ -1 +1 @@
-- CMAKE_C_COMPILER is ".*/Tests/RunCMake/CompilerChange/cc1.sh"
-- CMAKE_C_COMPILER is '[^']*/Tests/RunCMake/CompilerChange/cc1.sh'

3
Tests/RunCMake/CompilerChange/FirstCompiler.cmake
View File

@@ -1,3 +1,2 @@
enable_language(C)
message(STATUS "CMAKE_C_COMPILER is \"${CMAKE_C_COMPILER}\"")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cc.cmake" "set(CMAKE_C_COMPILER \"${CMAKE_C_COMPILER}\")\n")
message(STATUS "CMAKE_C_COMPILER is '${CMAKE_C_COMPILER}'")

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

@@ -25,34 +25,23 @@ set(cc3 CMAKE_C_COMPILER-NOTFOUND)
configure_file(${ccIn} ${cc1} @ONLY)
configure_file(${ccIn} ${cc2} @ONLY)
# Use a single build tree for remaining tests without cleaning.
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ChangeCompiler-build)
set(RunCMake_TEST_NO_CLEAN 1)
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
block()
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ChangeCompiler-build)
set(ENV{RunCMake_TEST} "FirstCompiler")
run_cmake_with_options(FirstCompiler -DCMAKE_C_COMPILER=${cc1})
set(RunCMake_TEST_NO_CLEAN 1)
set(ENV{RunCMake_TEST} "SecondCompiler")
run_cmake_with_options(SecondCompiler -DCMAKE_C_COMPILER=${cc2})
set(ENV{RunCMake_TEST} "EmptyCompiler")
run_cmake_with_options(EmptyCompiler -DCMAKE_C_COMPILER=)
endblock()
# Check build with compiler wrapper 1.
set(RunCMake_TEST_OPTIONS -DCMAKE_C_COMPILER=${cc1})
set(ENV{RunCMake_TEST} "FirstCompiler")
run_cmake(FirstCompiler)
include(${RunCMake_TEST_BINARY_DIR}/cc.cmake)
if(NOT "${CMAKE_C_COMPILER}" STREQUAL "${cc1}")
message(FATAL_ERROR "FirstCompiler built with compiler:\n ${CMAKE_C_COMPILER}\nand not with:\n ${cc1}")
endif()
# Check rebuild with compiler wrapper 2.
set(RunCMake_TEST_OPTIONS -DCMAKE_C_COMPILER=${cc2})
set(ENV{RunCMake_TEST} "SecondCompiler")
run_cmake(SecondCompiler)
include(${RunCMake_TEST_BINARY_DIR}/cc.cmake)
if(NOT "${CMAKE_C_COMPILER}" STREQUAL "${cc2}")
message(FATAL_ERROR "SecondCompiler built with compiler:\n ${CMAKE_C_COMPILER}\nand not with:\n ${cc2}")
endif()
# Check failure with an empty compiler string.
set(RunCMake_TEST_OPTIONS -DCMAKE_C_COMPILER=)
set(ENV{RunCMake_TEST} "EmptyCompiler")
run_cmake(EmptyCompiler)
include(${RunCMake_TEST_BINARY_DIR}/cc.cmake)
if(NOT "${CMAKE_C_COMPILER}" STREQUAL "${cc3}")
message(FATAL_ERROR "Empty built with compiler:\n ${CMAKE_C_COMPILER}\nand not with:\n ${cc3}")
endif()
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()

4
Tests/RunCMake/CompilerChange/SecondCompiler-stdout.txt
View File

@@ -1 +1,3 @@
-- CMAKE_C_COMPILER is ".*/Tests/RunCMake/CompilerChange/cc2.sh"
-- CMAKE_C_COMPILER is '[^']*/Tests/RunCMake/CompilerChange/cc1.sh'
.*
-- CMAKE_C_COMPILER is '[^']*/Tests/RunCMake/CompilerChange/cc2.sh'

3
Tests/RunCMake/CompilerChange/SecondCompiler.cmake
View File

@@ -1,3 +1,2 @@
enable_language(C)
message(STATUS "CMAKE_C_COMPILER is \"${CMAKE_C_COMPILER}\"")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cc.cmake" "set(CMAKE_C_COMPILER \"${CMAKE_C_COMPILER}\")\n")
message(STATUS "CMAKE_C_COMPILER is '${CMAKE_C_COMPILER}'")