dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-08 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'windows-toolchain-input'

Browse Source 
f5837208f5 CMAKE_TOOLCHAIN_FILE: Fix Windows saved input toolchain file syntax error
996fc21020 Tests: Enable toolchain parts of RunCMake.CompilerChange on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !12382
This commit is contained in:
Brad King
2026-08-08 14:47:26 +00:00
committed by Kitware Robot
parent 628ceffe6b f5837208f5
commit 3fdafa3302
4 changed files with 58 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeDetermineSystem.cmake
View File

@@ -227,7 +227,7 @@ if(CMAKE_BINARY_DIR)
set(INCLUDE_CMAKE_TOOLCHAIN_FILE_IF_REQUIRED)
if(CMAKE_TOOLCHAIN_FILE)
string(CONCAT INCLUDE_CMAKE_TOOLCHAIN_FILE_IF_REQUIRED
"set(_CMAKE_INPUT_TOOLCHAIN_FILE \"${_CMAKE_INPUT_TOOLCHAIN_FILE}\")\n"
"set(_CMAKE_INPUT_TOOLCHAIN_FILE [==[${_CMAKE_INPUT_TOOLCHAIN_FILE}]==])\n"
"set(_CMAKE_SYSTEM_TOOLCHAIN_FILE \"${CMAKE_TOOLCHAIN_FILE}\")\n"
"include(\"\${_CMAKE_SYSTEM_TOOLCHAIN_FILE}\")"
)

4
Tests/RunCMake/CMakeLists.txt
View File

@@ -392,9 +392,7 @@ add_RunCMake_test(CMakeRelease -DCMake_TEST_JQ=${CMake_TEST_JQ})
if(CMAKE_GENERATOR MATCHES "Make|Ninja")
add_RunCMake_test(Color)
endif()
if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Unix Makefiles|Ninja|FASTBuild")
add_RunCMake_test(CompilerChange)
endif()
add_RunCMake_test(CompilerChange)
add_RunCMake_test(CompilerNotFound)
if(DEFINED CMake_TEST_OBJC)
list(APPEND CMake_TEST_LANG_VARS -DCMake_TEST_OBJC=${CMake_TEST_OBJC})

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

@@ -1,51 +1,62 @@
include(RunCMake)
# Detect the compiler in use in the current environment.
run_cmake(FindCompiler)
include(${RunCMake_BINARY_DIR}/FindCompiler-build/cc.cmake)
if(NOT CMAKE_C_COMPILER)
message(FATAL_ERROR "FindCompiler provided no compiler!")
if(UNIX AND "${RunCMake_GENERATOR}" MATCHES "Unix Makefiles|Ninja|FASTBuild")
# Detect the compiler in use in the current environment.
run_cmake(FindCompiler)
include(${RunCMake_BINARY_DIR}/FindCompiler-build/cc.cmake)
if(NOT CMAKE_C_COMPILER)
message(FATAL_ERROR "FindCompiler provided no compiler!")
endif()
if(NOT IS_ABSOLUTE "${CMAKE_C_COMPILER}")
message(FATAL_ERROR "FindCompiler provided non-absolute path \"${CMAKE_C_COMPILER}\"!")
endif()
if(NOT EXISTS "${CMAKE_C_COMPILER}")
message(FATAL_ERROR "FindCompiler provided non-existing path \"${CMAKE_C_COMPILER}\"!")
endif()
# Now that we have the full compiler path, hide CC.
unset(ENV{CC})
# Wrap around the real compiler so we can change the compiler
# path without changing the underlying compiler.
set(ccIn ${RunCMake_SOURCE_DIR}/cc.sh.in)
set(cc1 ${RunCMake_BINARY_DIR}/cc1.sh)
set(cc2 ${RunCMake_BINARY_DIR}/cc2.sh)
set(cc3 CMAKE_C_COMPILER-NOTFOUND)
configure_file(${ccIn} ${cc1} @ONLY)
configure_file(${ccIn} ${cc2} @ONLY)
block()
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ChangeCompiler-build)
run_cmake_with_options(FirstCompiler -DCMAKE_C_COMPILER=${cc1})
set(RunCMake_TEST_NO_CLEAN 1)
run_cmake_with_options(SecondCompiler -DCMAKE_C_COMPILER=${cc2})
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()
endif()
if(NOT IS_ABSOLUTE "${CMAKE_C_COMPILER}")
message(FATAL_ERROR "FindCompiler provided non-absolute path \"${CMAKE_C_COMPILER}\"!")
endif()
if(NOT EXISTS "${CMAKE_C_COMPILER}")
message(FATAL_ERROR "FindCompiler provided non-existing path \"${CMAKE_C_COMPILER}\"!")
endif()
# Now that we have the full compiler path, hide CC.
unset(ENV{CC})
# Wrap around the real compiler so we can change the compiler
# path without changing the underlying compiler.
set(ccIn ${RunCMake_SOURCE_DIR}/cc.sh.in)
set(cc1 ${RunCMake_BINARY_DIR}/cc1.sh)
set(cc2 ${RunCMake_BINARY_DIR}/cc2.sh)
set(cc3 CMAKE_C_COMPILER-NOTFOUND)
configure_file(${ccIn} ${cc1} @ONLY)
configure_file(${ccIn} ${cc2} @ONLY)
block()
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ChangeCompiler-build)
run_cmake_with_options(FirstCompiler -DCMAKE_C_COMPILER=${cc1})
set(RunCMake_TEST_NO_CLEAN 1)
run_cmake_with_options(SecondCompiler -DCMAKE_C_COMPILER=${cc2})
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()
# Set up "toolchain" files
file(WRITE "${RunCMake_BINARY_DIR}/foo.cmake" "set(toolchain_var foo)\n")
file(WRITE "${RunCMake_BINARY_DIR}/bar.cmake" "set(toolchain_var bar)\n")
if(UNIX)
# Can't use file(TO_NATIVE_PATH) because it escapes spaces and cmake_path is
# 3.20
set(foo_TOOLCHAIN_FILE "${RunCMake_BINARY_DIR}/foo.cmake")
set(bar_TOOLCHAIN_FILE "${RunCMake_BINARY_DIR}/bar.cmake")
else()
set(foo_TOOLCHAIN_FILE "${RunCMake_BINARY_DIR}\\foo.cmake")
set(bar_TOOLCHAIN_FILE "${RunCMake_BINARY_DIR}\\bar.cmake")
endif()
# New toolchain path comes from file
block()
@@ -68,11 +79,11 @@ endblock()
block()
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ToolchainFromCmdline-build)
run_cmake_with_options(ToolchainFromCmdline-step1
"-DCMAKE_TOOLCHAIN_FILE=${RunCMake_BINARY_DIR}/foo.cmake"
"-DCMAKE_TOOLCHAIN_FILE=${foo_TOOLCHAIN_FILE}"
)
set(RunCMake_TEST_NO_CLEAN 1)
run_cmake_with_options(ToolchainFromCmdline-step2
"-DCMAKE_TOOLCHAIN_FILE=${RunCMake_BINARY_DIR}/bar.cmake"
"-DCMAKE_TOOLCHAIN_FILE=${bar_TOOLCHAIN_FILE}"
)
endblock()
@@ -83,7 +94,7 @@ block()
${RunCMake_SOURCE_DIR}/ToolchainFromCmdlineOnce-stdout.txt
)
run_cmake_with_options(ToolchainFromCmdlineOnce-step1
"-DCMAKE_TOOLCHAIN_FILE=${RunCMake_BINARY_DIR}/foo.cmake"
"-DCMAKE_TOOLCHAIN_FILE=${foo_TOOLCHAIN_FILE}"
)
set(RunCMake_TEST_NO_CLEAN 1)
run_cmake(ToolchainFromCmdlineOnce-step2)

2
Tests/RunCMake/CompilerChange/ToolchainFromCmdline-step2-stderr.txt
View File

@@ -2,4 +2,4 @@ You have changed variables that require your cache to be deleted.
Configure will be re-run and you may have to reset some variables.
The following variables have changed:
CMAKE_TOOLCHAIN_FILE= [^
]*/Tests/RunCMake/CompilerChange/bar\.cmake
]*[\/]Tests[\/]RunCMake[\/]CompilerChange[\/]bar\.cmake