Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-04-04 16:02:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 84b3c69ff5 into 962c0e72b4

Browse Source
This commit is contained in:
rherilier 2025-01-29 22:19:50 +00:00 committed by GitHub
commit 8ddb8a67a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@ -132,11 +132,30 @@ endif()
# Find Clang resource directory with Clang executable. # Find Clang resource directory with Clang executable.
if(NOT CLANG_RESOURCE_DIR) if(NOT CLANG_RESOURCE_DIR)
find_program(CLANG_EXECUTABLE clang) find_program(CLANG_EXECUTABLE clang-${Clang_VERSION_MAJOR} NAMES clang)
if(NOT CLANG_EXECUTABLE) if(NOT CLANG_EXECUTABLE)
message(FATAL_ERROR "clang executable not found.") message(FATAL_ERROR "clang executable not found.")
endif() endif()
execute_process(
COMMAND ${CLANG_EXECUTABLE} -dumpversion
RESULT_VARIABLE CLANG_DUMP_VERSION_RESULT
OUTPUT_VARIABLE CLANG_DUMP_VERSION
ERROR_VARIABLE CLANG_DUMP_VERSION_ERROR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if(CLANG_DUMP_VERSION_RESULT)
message(FATAL_ERROR "Error retrieving Clang executable version. \
Output:\n${CLANG_DUMP_VERSION_ERROR}")
endif()
if (NOT ${CLANG_DUMP_VERSION} STREQUAL ${Clang_VERSION})
message(FATAL_ERROR "Clang libraries and executable versions differs:\n\
librairies have version ${Clang_VERSION} and executable has version \
${CLANG_DUMP_VERSION}.")
endif()
execute_process( execute_process(
COMMAND ${CLANG_EXECUTABLE} -print-resource-dir COMMAND ${CLANG_EXECUTABLE} -print-resource-dir
RESULT_VARIABLE CLANG_FIND_RESOURCE_DIR_RESULT RESULT_VARIABLE CLANG_FIND_RESOURCE_DIR_RESULT
@ -147,7 +166,7 @@ if(NOT CLANG_RESOURCE_DIR)
if(CLANG_FIND_RESOURCE_DIR_RESULT) if(CLANG_FIND_RESOURCE_DIR_RESULT)
message(FATAL_ERROR "Error retrieving Clang resource directory with Clang \ message(FATAL_ERROR "Error retrieving Clang resource directory with Clang \
executable. Output:\n ${CLANG_FIND_RESOURCE_DIR_ERROR}") executable. Output:\n${CLANG_FIND_RESOURCE_DIR_ERROR}")
endif() endif()
endif() endif()