dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-06-30 19:57:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clang-CXX: Flatten C++ module scanning conditions to reduce nesting

Browse Source
This commit is contained in:
Brad King
2026-03-27 11:54:36 -04:00
parent 2fcfea26ce
commit 7c2bd4f534
1 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
Modules/Compiler/Clang-CXX.cmake
View File

@@ -20,43 +20,41 @@ if("x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC")
set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE_DRIVER_MODE "cl")
endif()
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0)
if("x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU")
if (CMAKE_CXX_COMPILER_CLANG_RESOURCE_DIR)
set(_clang_scan_deps_resource_dir
" -resource-dir \"${CMAKE_CXX_COMPILER_CLANG_RESOURCE_DIR}\"")
else()
set(_clang_scan_deps_resource_dir "")
endif ()
if (CMAKE_HOST_WIN32)
# `rename` doesn't overwrite and doesn't retry in case of "target file is
# busy".
set(_clang_scan_deps_mv "\"${CMAKE_COMMAND}\" -E rename")
else ()
set(_clang_scan_deps_mv "mv")
endif ()
string(CONCAT CMAKE_CXX_SCANDEP_SOURCE
"\"${CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS}\""
" -format=p1689"
" --"
" <CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS>"
" -x c++ <SOURCE> -c -o <OBJECT>"
"${_clang_scan_deps_resource_dir}"
" -MT <DYNDEP_FILE>"
" -MD -MF <DEP_FILE>"
# Write to a temporary file. If the scan fails, we do not want to update
# the actual output file as `ninja` (at least) assumes that failed
# commands either delete or leave output files alone. See Issue#25419.
" > <DYNDEP_FILE>.tmp"
# We cannot use `copy_if_different` as the rule does not have a feature
# analogous to `ninja`'s `restat = 1`. It would also leave behind the
# `.tmp` file.
" && ${_clang_scan_deps_mv} <DYNDEP_FILE>.tmp <DYNDEP_FILE>")
unset(_clang_scan_deps_resource_dir)
unset(_clang_scan_deps_mv)
set(CMAKE_CXX_MODULE_MAP_FORMAT "clang")
set(CMAKE_CXX_MODULE_MAP_FLAG "@<MODULE_MAP_FILE>")
set(CMAKE_CXX_COMPILE_BMI
"<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> --precompile <SOURCE>")
endif()
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0 AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "GNU")
if (CMAKE_CXX_COMPILER_CLANG_RESOURCE_DIR)
set(_clang_scan_deps_resource_dir
" -resource-dir \"${CMAKE_CXX_COMPILER_CLANG_RESOURCE_DIR}\"")
else()
set(_clang_scan_deps_resource_dir "")
endif ()
if (CMAKE_HOST_WIN32)
# `rename` doesn't overwrite and doesn't retry in case of "target file is
# busy".
set(_clang_scan_deps_mv "\"${CMAKE_COMMAND}\" -E rename")
else ()
set(_clang_scan_deps_mv "mv")
endif ()
string(CONCAT CMAKE_CXX_SCANDEP_SOURCE
"\"${CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS}\""
" -format=p1689"
" --"
" <CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS>"
" -x c++ <SOURCE> -c -o <OBJECT>"
"${_clang_scan_deps_resource_dir}"
" -MT <DYNDEP_FILE>"
" -MD -MF <DEP_FILE>"
# Write to a temporary file. If the scan fails, we do not want to update
# the actual output file as `ninja` (at least) assumes that failed
# commands either delete or leave output files alone. See Issue#25419.
" > <DYNDEP_FILE>.tmp"
# We cannot use `copy_if_different` as the rule does not have a feature
# analogous to `ninja`'s `restat = 1`. It would also leave behind the
# `.tmp` file.
" && ${_clang_scan_deps_mv} <DYNDEP_FILE>.tmp <DYNDEP_FILE>")
unset(_clang_scan_deps_resource_dir)
unset(_clang_scan_deps_mv)
set(CMAKE_CXX_MODULE_MAP_FORMAT "clang")
set(CMAKE_CXX_MODULE_MAP_FLAG "@<MODULE_MAP_FILE>")
set(CMAKE_CXX_COMPILE_BMI
"<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> --precompile <SOURCE>")
endif()