1
0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-21 23:00:50 +08:00

CMakeDetermineASMCompiler: De-duplicate list of compiler info variables

This commit is contained in:
Brad King
2025-03-19 13:12:57 -04:00
parent c0224f5aa1
commit eddf66eaef
2 changed files with 19 additions and 26 deletions

View File

@@ -238,18 +238,6 @@ else()
message(STATUS "Didn't find assembler")
endif()
foreach(_var
COMPILER
COMPILER_ID
COMPILER_ARG1
COMPILER_ENV_VAR
COMPILER_AR
COMPILER_RANLIB
COMPILER_VERSION
)
set(_CMAKE_ASM_${_var} "${CMAKE_ASM${ASM_DIALECT}_${_var}}")
endforeach()
if(CMAKE_ASM${ASM_DIALECT}_COMPILER_SYSROOT)
string(CONCAT _SET_CMAKE_ASM_COMPILER_SYSROOT
"set(CMAKE_ASM${ASM_DIALECT}_COMPILER_SYSROOT \"${CMAKE_ASM${ASM_DIALECT}_COMPILER_SYSROOT}\")\n"
@@ -273,17 +261,19 @@ else()
endif()
# configure variables set in this file for fast reload later on
configure_file(${CMAKE_ROOT}/Modules/CMakeASMCompiler.cmake.in
${CMAKE_PLATFORM_INFO_DIR}/CMakeASM${ASM_DIALECT}Compiler.cmake @ONLY)
foreach(_var
COMPILER
COMPILER_ID
COMPILER_ARG1
COMPILER_ENV_VAR
COMPILER_AR
COMPILER_RANLIB
COMPILER_VERSION
)
unset(_CMAKE_ASM_${_var})
endforeach()
block()
foreach(_var IN ITEMS
# Keep in sync with Internal/CMakeTestASMLinker.
COMPILER
COMPILER_ID
COMPILER_ARG1
COMPILER_ENV_VAR
COMPILER_AR
COMPILER_RANLIB
COMPILER_VERSION
)
set(_CMAKE_ASM_${_var} "${CMAKE_ASM${ASM_DIALECT}_${_var}}")
endforeach()
configure_file(${CMAKE_ROOT}/Modules/CMakeASMCompiler.cmake.in
${CMAKE_PLATFORM_INFO_DIR}/CMakeASM${ASM_DIALECT}Compiler.cmake @ONLY)
endblock()

View File

@@ -4,6 +4,8 @@
# Re-configure to save learned information.
block()
foreach(_var IN ITEMS
# Compiler information.
# Keep in sync with CMakeDetermineASMCompiler.
COMPILER
COMPILER_ID
COMPILER_ARG1
@@ -11,6 +13,7 @@ block()
COMPILER_AR
COMPILER_RANLIB
COMPILER_VERSION
# Linker information.
COMPILER_LINKER
COMPILER_LINKER_ID
COMPILER_LINKER_VERSION