mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-25 04:09:36 +03:00
Code Activity

Merge topic 'clang-cl-absolute-source-path' into release-4.4

Browse Source 
68491cedcf clang-cl: Fix C++ module scanning when cross-compiling from Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12389
This commit is contained in:
Brad King
2026-08-12 11:47:00 -04:00
committed by Kitware Robot
parent bd456b9f3a 68491cedcf
commit f27e315222
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Compiler/Clang-CXX.cmake
+6 -2
View File
@@ -37,18 +37,21 @@ if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0 AND CMAKE_CXX_COMPILER
endif ()
if(CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
set(_clang "-clang:")
set(_srcsep "-- ")
else()
set(_clang "")
set(_srcsep "")
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 ${_clang}-o ${_clang}<OBJECT>"
" -x c++ -c ${_clang}-o ${_clang}<OBJECT>"
"${_clang_scan_deps_resource_dir}"
" ${_clang}-MT ${_clang}<DYNDEP_FILE>"
" ${_clang}-MD ${_clang}-MF ${_clang}<DEP_FILE>"
" ${_srcsep}<SOURCE>"
# 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.
@@ -62,6 +65,7 @@ if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0 AND CMAKE_CXX_COMPILER
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> ${_clang}-o ${_clang}<OBJECT> --precompile <SOURCE>")
"<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> ${_clang}-o ${_clang}<OBJECT> --precompile ${_srcsep}<SOURCE>")
unset(_clang)
unset(_srcsep)
endif()