authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-25 20:26:14-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-25 20:26:14-07:00
log9c3bd437e66b4b4e0d1b093e988229e9a6135d36
treecb776ad7ed8d641953f74f80c89f58582df956bf
parent96a55f6ce86dc2e25c275ee3211b2cde0e3d92ab

update cmake files to LLVM 16

4 files changed, 28 insertions(+), 28 deletions(-)

CMakeLists.txt+3-3
...@@ -127,9 +127,9 @@ if(ZIG_AR_WORKAROUND)...@@ -127,9 +127,9 @@ if(ZIG_AR_WORKAROUND)
127 string(REPLACE "<CMAKE_AR>" "<CMAKE_AR> ar" CMAKE_CXX_ARCHIVE_CREATE ${CMAKE_CXX_ARCHIVE_CREATE})127 string(REPLACE "<CMAKE_AR>" "<CMAKE_AR> ar" CMAKE_CXX_ARCHIVE_CREATE ${CMAKE_CXX_ARCHIVE_CREATE})
128endif()128endif()
129129
130find_package(llvm 15)130find_package(llvm 16)
131find_package(clang 15)131find_package(clang 16)
132find_package(lld 15)132find_package(lld 16)
133133
134if(ZIG_STATIC_ZLIB)134if(ZIG_STATIC_ZLIB)
135 if (MSVC)135 if (MSVC)
cmake/Findclang.cmake+3-3
...@@ -17,9 +17,9 @@ find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h...@@ -17,9 +17,9 @@ find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
17if(${LLVM_LINK_MODE} STREQUAL "shared")17if(${LLVM_LINK_MODE} STREQUAL "shared")
18 find_library(CLANG_LIBRARIES18 find_library(CLANG_LIBRARIES
19 NAMES19 NAMES
20 libclang-cpp.so.1520 libclang-cpp.so.16
21 clang-cpp-15.021 clang-cpp-16.0
22 clang-cpp15022 clang-cpp160
23 clang-cpp23 clang-cpp
24 NAMES_PER_DIR24 NAMES_PER_DIR
25 HINTS "${LLVM_LIBDIRS}"25 HINTS "${LLVM_LIBDIRS}"
cmake/Findlld.cmake+16-16
...@@ -9,21 +9,21 @@...@@ -9,21 +9,21 @@
9find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h9find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
10 HINTS ${LLVM_INCLUDE_DIRS}10 HINTS ${LLVM_INCLUDE_DIRS}
11 PATHS11 PATHS
12 /usr/lib/llvm-15/include12 /usr/lib/llvm-16/include
13 /usr/local/llvm150/include13 /usr/local/llvm160/include
14 /usr/local/llvm15/include14 /usr/local/llvm16/include
15 /usr/local/opt/llvm@15/include15 /usr/local/opt/llvm@16/include
16 /opt/homebrew/opt/llvm@15/include16 /opt/homebrew/opt/llvm@16/include
17 /mingw64/include)17 /mingw64/include)
1818
19find_library(LLD_LIBRARY NAMES lld-15.0 lld150 lld NAMES_PER_DIR19find_library(LLD_LIBRARY NAMES lld-16.0 lld160 lld NAMES_PER_DIR
20 HINTS ${LLVM_LIBDIRS}20 HINTS ${LLVM_LIBDIRS}
21 PATHS21 PATHS
22 /usr/lib/llvm-15/lib22 /usr/lib/llvm-16/lib
23 /usr/local/llvm150/lib23 /usr/local/llvm160/lib
24 /usr/local/llvm15/lib24 /usr/local/llvm16/lib
25 /usr/local/opt/llvm@15/lib25 /usr/local/opt/llvm@16/lib
26 /opt/homebrew/opt/llvm@15/lib26 /opt/homebrew/opt/llvm@16/lib
27)27)
28if(EXISTS ${LLD_LIBRARY})28if(EXISTS ${LLD_LIBRARY})
29 set(LLD_LIBRARIES ${LLD_LIBRARY})29 set(LLD_LIBRARIES ${LLD_LIBRARY})
...@@ -34,11 +34,11 @@ else()...@@ -34,11 +34,11 @@ else()
34 HINTS ${LLVM_LIBDIRS}34 HINTS ${LLVM_LIBDIRS}
35 PATHS35 PATHS
36 ${LLD_LIBDIRS}36 ${LLD_LIBDIRS}
37 /usr/lib/llvm-15/lib37 /usr/lib/llvm-16/lib
38 /usr/local/llvm150/lib38 /usr/local/llvm160/lib
39 /usr/local/llvm15/lib39 /usr/local/llvm16/lib
40 /usr/local/opt/llvm@15/lib40 /usr/local/opt/llvm@16/lib
41 /opt/homebrew/opt/llvm@15/lib41 /opt/homebrew/opt/llvm@16/lib
42 /mingw64/lib42 /mingw64/lib
43 /c/msys64/mingw64/lib43 /c/msys64/mingw64/lib
44 c:/msys64/mingw64/lib)44 c:/msys64/mingw64/lib)
cmake/Findllvm.cmake+6-6
...@@ -14,12 +14,12 @@ if(ZIG_USE_LLVM_CONFIG)...@@ -14,12 +14,12 @@ if(ZIG_USE_LLVM_CONFIG)
14 while(1)14 while(1)
15 unset(LLVM_CONFIG_EXE CACHE)15 unset(LLVM_CONFIG_EXE CACHE)
16 find_program(LLVM_CONFIG_EXE16 find_program(LLVM_CONFIG_EXE
17 NAMES llvm-config-15 llvm-config-15.0 llvm-config150 llvm-config15 llvm-config NAMES_PER_DIR17 NAMES llvm-config-16 llvm-config-16.0 llvm-config160 llvm-config16 llvm-config NAMES_PER_DIR
18 PATHS18 PATHS
19 "/mingw64/bin"19 "/mingw64/bin"
20 "/c/msys64/mingw64/bin"20 "/c/msys64/mingw64/bin"
21 "c:/msys64/mingw64/bin"21 "c:/msys64/mingw64/bin"
22 "C:/Libraries/llvm-15.0.0/bin")22 "C:/Libraries/llvm-16.0.0/bin")
2323
24 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")24 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
25 if (NOT LLVM_CONFIG_ERROR_MESSAGES STREQUAL "")25 if (NOT LLVM_CONFIG_ERROR_MESSAGES STREQUAL "")
...@@ -37,9 +37,9 @@ if(ZIG_USE_LLVM_CONFIG)...@@ -37,9 +37,9 @@ if(ZIG_USE_LLVM_CONFIG)
37 OUTPUT_STRIP_TRAILING_WHITESPACE)37 OUTPUT_STRIP_TRAILING_WHITESPACE)
3838
39 get_filename_component(LLVM_CONFIG_DIR "${LLVM_CONFIG_EXE}" DIRECTORY)39 get_filename_component(LLVM_CONFIG_DIR "${LLVM_CONFIG_EXE}" DIRECTORY)
40 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 15 OR "${LLVM_CONFIG_VERSION}" VERSION_EQUAL 16 OR "${LLVM_CONFIG_VERSION}" VERSION_GREATER 16)40 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 16 OR "${LLVM_CONFIG_VERSION}" VERSION_EQUAL 17 OR "${LLVM_CONFIG_VERSION}" VERSION_GREATER 17)
41 # Save the error message, in case this is the last llvm-config we find41 # Save the error message, in case this is the last llvm-config we find
42 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "expected LLVM 15.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")42 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "expected LLVM 16.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
4343
44 # Ignore this directory and try the search again44 # Ignore this directory and try the search again
45 list(APPEND CMAKE_IGNORE_PATH "${LLVM_CONFIG_DIR}")45 list(APPEND CMAKE_IGNORE_PATH "${LLVM_CONFIG_DIR}")
...@@ -63,9 +63,9 @@ if(ZIG_USE_LLVM_CONFIG)...@@ -63,9 +63,9 @@ if(ZIG_USE_LLVM_CONFIG)
63 if (LLVM_CONFIG_ERROR) 63 if (LLVM_CONFIG_ERROR)
64 # Save the error message, in case this is the last llvm-config we find64 # Save the error message, in case this is the last llvm-config we find
65 if (ZIG_SHARED_LLVM)65 if (ZIG_SHARED_LLVM)
66 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 15.x found at ${LLVM_CONFIG_EXE} does not support linking as a shared library")66 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 16.x found at ${LLVM_CONFIG_EXE} does not support linking as a shared library")
67 else()67 else()
68 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 15.x found at ${LLVM_CONFIG_EXE} does not support linking as a static library")68 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 16.x found at ${LLVM_CONFIG_EXE} does not support linking as a static library")
69 endif()69 endif()
7070
71 # Ignore this directory and try the search again71 # Ignore this directory and try the search again