diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-27 14:05:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-27 14:05:12 (GMT) |
| commit | 9b4bbd26a932a0a6b897a746b211eb163c742c73 (patch) | |
| tree | 58e9b8061bbf347de4e067a9a7afdfad68dc3d38 /Modules | |
| parent | 083afc88dbe2816e6abf35267a2be3fcb75a2b7f (diff) | |
| parent | 7008fc234b189d5e3068fb8b6fca9ed76df600f5 (diff) | |
| download | CMake-9b4bbd26a932a0a6b897a746b211eb163c742c73.zip CMake-9b4bbd26a932a0a6b897a746b211eb163c742c73.tar.gz CMake-9b4bbd26a932a0a6b897a746b211eb163c742c73.tar.bz2 | |
Merge topic 'clang-use-arg1' into release-3.29
7008fc234b CMakeDetermineCompilerId: use `_ARG1` to query the clang resource dir
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9285
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index e46109f..7d063ed 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -296,7 +296,9 @@ function(CMAKE_DETERMINE_COMPILER_ID lang flagvar src) "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 + COMMAND "${CMAKE_${lang}_COMPILER}" + ${CMAKE_${lang}_COMPILER_ID_ARG1} + -print-resource-dir OUTPUT_VARIABLE _clang_resource_dir_out ERROR_VARIABLE _clang_resource_dir_err RESULT_VARIABLE _clang_resource_dir_res |