mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'source-from-var' into release-3.25

Browse Source 
f6b99c5087 Check*: Restore support for arbitrary result variable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7960
This commit is contained in:
Brad King
2022-11-29 15:27:12 +00:00
committed by Kitware Robot
parent 0da7ec03dd f6b99c5087
commit 3f05665a3f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/CheckIncludeFiles.cmake
View File

@@ -70,10 +70,11 @@ macro(CHECK_INCLUDE_FILES INCLUDE VARIABLE)
message(FATAL_ERROR "Unknown arguments:\n ${ARGN}\n")
endif()
string(MAKE_C_IDENTIFIER ${VARIABLE} _variable_escaped)
if(_lang STREQUAL "C")
set(src ${VARIABLE}.c)
set(src ${_variable_escaped}.c)
elseif(_lang STREQUAL "CXX")
set(src ${VARIABLE}.cpp)
set(src ${_variable_escaped}.cpp)
else()
message(FATAL_ERROR "Unknown language:\n ${_lang}\nSupported languages: C, CXX.\n")
endif()

5
Modules/CheckTypeSize.cmake
View File

@@ -103,10 +103,11 @@ function(__check_type_size_impl type var map builtin language)
endif()
# Perform language check
string(MAKE_C_IDENTIFIER ${var} _var_escaped)
if(language STREQUAL "C")
set(src ${var}.c)
set(src ${_var_escaped}.c)
elseif(language STREQUAL "CXX")
set(src ${var}.cpp)
set(src ${_var_escaped}.cpp)
else()
message(FATAL_ERROR "Unknown language:\n ${language}\nSupported languages: C, CXX.\n")
endif()