echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'cxxmodules-clang-resource-dir'

Browse Source 
a3ada1a241 Clang: detect -resource-dir for clang-scan-deps

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9274
This commit is contained in:
Brad King 2024-02-22 13:23:19 +00:00 committed by Kitware Robot
commit c29bc18b10
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/CMakeCXXCompiler.cmake.in
View File

@ -89,3 +89,4 @@ set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "@CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTOR
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "@CMAKE_CXX_IMPLICIT_LINK_LIBRARIES@")
set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "@CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES@")
set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "@CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES@")
set(CMAKE_CXX_COMPILER_CLANG_RESOURCE_DIR "@CMAKE_CXX_COMPILER_CLANG_RESOURCE_DIR@")

22
Modules/CMakeDetermineCompilerId.cmake
View File

@ -289,6 +289,27 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
set(CMAKE_${lang}_COMPILER_FRONTEND_VARIANT "")
endif()
# `clang-scan-deps` needs to know the resource directory. This only matters
# for C++ and the GNU-frontend variant.
set(CMAKE_${lang}_COMPILER_CLANG_RESOURCE_DIR "")
if ("x${lang}" STREQUAL "xCXX" AND
"x${CMAKE_${lang}_COMPILER_ID}" STREQUAL "xClang" AND
"x${CMAKE_${lang}_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU")
execute_process(
COMMAND "${CMAKE_${lang}_COMPILER}" -print-resource-dir
OUTPUT_VARIABLE _clang_resource_dir_out
ERROR_VARIABLE _clang_resource_dir_err
RESULT_VARIABLE _clang_resource_dir_res
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_STRIP_TRAILING_WHITESPACE)
if (_clang_resource_dir_res EQUAL 0)
file(TO_CMAKE_PATH "${_clang_resource_dir_out}" _clang_resource_dir_out)
if(IS_DIRECTORY "${_clang_resource_dir_out}")
set(CMAKE_${lang}_COMPILER_CLANG_RESOURCE_DIR "${_clang_resource_dir_out}")
endif()
endif ()
endif ()
# Display the final identification result.
if(CMAKE_${lang}_COMPILER_ID)
if(CMAKE_${lang}_COMPILER_VERSION)
@ -331,6 +352,7 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src)
set(CMAKE_${lang}_EXTENSIONS_COMPUTED_DEFAULT "${CMAKE_${lang}_EXTENSIONS_COMPUTED_DEFAULT}" PARENT_SCOPE)
set(CMAKE_${lang}_COMPILER_PRODUCED_OUTPUT "${COMPILER_${lang}_PRODUCED_OUTPUT}" PARENT_SCOPE)
set(CMAKE_${lang}_COMPILER_PRODUCED_FILES "${COMPILER_${lang}_PRODUCED_FILES}" PARENT_SCOPE)
set(CMAKE_${lang}_COMPILER_CLANG_RESOURCE_DIR "${CMAKE_${lang}_COMPILER_CLANG_RESOURCE_DIR}" PARENT_SCOPE)
endfunction()
include(CMakeCompilerIdDetection)

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

@ -32,6 +32,12 @@ 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".
@ -45,6 +51,7 @@ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0)
" --"
" <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
@ -55,6 +62,7 @@ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0)
# 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>")