authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-02-03 13:38:48-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-02-03 13:38:48-07:00
log308f72701af0a44bdb2cb2893f3175b7d37f657b
tree0f05f64892186d93d8cc089cd3950aacb3e55523
parent3832b582292d3065f600e7c7a8393c411e6cdb0a

update cmake files to LLVM 14

3 files changed, 80 insertions(+), 80 deletions(-)

cmake/Findclang.cmake+23-23
...@@ -9,31 +9,31 @@...@@ -9,31 +9,31 @@
99
10find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h10find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
11 PATHS11 PATHS
12 /usr/lib/llvm/13/include12 /usr/lib/llvm/14/include
13 /usr/lib/llvm-13/include13 /usr/lib/llvm-14/include
14 /usr/lib/llvm-13.0/include14 /usr/lib/llvm-14.0/include
15 /usr/local/llvm130/include15 /usr/local/llvm140/include
16 /usr/local/llvm13/include16 /usr/local/llvm14/include
17 /usr/local/opt/llvm@13/include17 /usr/local/opt/llvm@14/include
18 /opt/homebrew/opt/llvm@13/include18 /opt/homebrew/opt/llvm@14/include
19 /mingw64/include19 /mingw64/include
20)20)
2121
22if(ZIG_PREFER_CLANG_CPP_DYLIB)22if(ZIG_PREFER_CLANG_CPP_DYLIB)
23 find_library(CLANG_LIBRARIES23 find_library(CLANG_LIBRARIES
24 NAMES24 NAMES
25 clang-cpp-13.025 clang-cpp-14.0
26 clang-cpp13026 clang-cpp140
27 clang-cpp27 clang-cpp
28 PATHS28 PATHS
29 ${CLANG_LIBDIRS}29 ${CLANG_LIBDIRS}
30 /usr/lib/llvm/13/lib30 /usr/lib/llvm/14/lib
31 /usr/lib/llvm/13/lib6431 /usr/lib/llvm/14/lib64
32 /usr/lib/llvm-13/lib32 /usr/lib/llvm-14/lib
33 /usr/local/llvm130/lib33 /usr/local/llvm140/lib
34 /usr/local/llvm13/lib34 /usr/local/llvm14/lib
35 /usr/local/opt/llvm@13/lib35 /usr/local/opt/llvm@14/lib
36 /opt/homebrew/opt/llvm@13/lib36 /opt/homebrew/opt/llvm@14/lib
37 )37 )
38endif()38endif()
3939
...@@ -43,13 +43,13 @@ if(NOT CLANG_LIBRARIES)...@@ -43,13 +43,13 @@ if(NOT CLANG_LIBRARIES)
43 find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}43 find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
44 PATHS44 PATHS
45 ${CLANG_LIBDIRS}45 ${CLANG_LIBDIRS}
46 /usr/lib/llvm/13/lib46 /usr/lib/llvm/14/lib
47 /usr/lib/llvm-13/lib47 /usr/lib/llvm-14/lib
48 /usr/lib/llvm-13.0/lib48 /usr/lib/llvm-14.0/lib
49 /usr/local/llvm130/lib49 /usr/local/llvm140/lib
50 /usr/local/llvm13/lib50 /usr/local/llvm14/lib
51 /usr/local/opt/llvm@13/lib51 /usr/local/opt/llvm@14/lib
52 /opt/homebrew/opt/llvm@13/lib52 /opt/homebrew/opt/llvm@14/lib
53 /mingw64/lib53 /mingw64/lib
54 /c/msys64/mingw64/lib54 /c/msys64/mingw64/lib
55 c:\\msys64\\mingw64\\lib55 c:\\msys64\\mingw64\\lib
cmake/Findlld.cmake+16-16
...@@ -8,20 +8,20 @@...@@ -8,20 +8,20 @@
88
9find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h9find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
10 PATHS10 PATHS
11 /usr/lib/llvm-13/include11 /usr/lib/llvm-14/include
12 /usr/local/llvm130/include12 /usr/local/llvm140/include
13 /usr/local/llvm13/include13 /usr/local/llvm14/include
14 /usr/local/opt/llvm@13/include14 /usr/local/opt/llvm@14/include
15 /opt/homebrew/opt/llvm@13/include15 /opt/homebrew/opt/llvm@14/include
16 /mingw64/include)16 /mingw64/include)
1717
18find_library(LLD_LIBRARY NAMES lld-13.0 lld130 lld18find_library(LLD_LIBRARY NAMES lld-14.0 lld140 lld
19 PATHS19 PATHS
20 /usr/lib/llvm-13/lib20 /usr/lib/llvm-14/lib
21 /usr/local/llvm130/lib21 /usr/local/llvm140/lib
22 /usr/local/llvm13/lib22 /usr/local/llvm14/lib
23 /usr/local/opt/llvm@13/lib23 /usr/local/opt/llvm@14/lib
24 /opt/homebrew/opt/llvm@13/lib24 /opt/homebrew/opt/llvm@14/lib
25)25)
26if(EXISTS ${LLD_LIBRARY})26if(EXISTS ${LLD_LIBRARY})
27 set(LLD_LIBRARIES ${LLD_LIBRARY})27 set(LLD_LIBRARIES ${LLD_LIBRARY})
...@@ -31,11 +31,11 @@ else()...@@ -31,11 +31,11 @@ else()
31 find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}31 find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
32 PATHS32 PATHS
33 ${LLD_LIBDIRS}33 ${LLD_LIBDIRS}
34 /usr/lib/llvm-13/lib34 /usr/lib/llvm-14/lib
35 /usr/local/llvm130/lib35 /usr/local/llvm140/lib
36 /usr/local/llvm13/lib36 /usr/local/llvm14/lib
37 /usr/local/opt/llvm@13/lib37 /usr/local/opt/llvm@14/lib
38 /opt/homebrew/opt/llvm@13/lib38 /opt/homebrew/opt/llvm@14/lib
39 /mingw64/lib39 /mingw64/lib
40 /c/msys64/mingw64/lib40 /c/msys64/mingw64/lib
41 c:/msys64/mingw64/lib)41 c:/msys64/mingw64/lib)
cmake/Findllvm.cmake+41-41
...@@ -9,41 +9,41 @@...@@ -9,41 +9,41 @@
99
10find_path(LLVM_INCLUDE_DIRS NAMES llvm/IR/IRBuilder.h10find_path(LLVM_INCLUDE_DIRS NAMES llvm/IR/IRBuilder.h
11 PATHS11 PATHS
12 /usr/lib/llvm/13/include12 /usr/lib/llvm/14/include
13 /usr/lib/llvm-13/include13 /usr/lib/llvm-14/include
14 /usr/lib/llvm-13.0/include14 /usr/lib/llvm-14.0/include
15 /usr/local/llvm13/include15 /usr/local/llvm14/include
16 /usr/local/llvm130/include16 /usr/local/llvm140/include
17 /usr/local/opt/llvm@13/include17 /usr/local/opt/llvm@14/include
18 /opt/homebrew/opt/llvm@13/include18 /opt/homebrew/opt/llvm@14/include
19 /mingw64/include19 /mingw64/include
20)20)
2121
22if(ZIG_PREFER_CLANG_CPP_DYLIB)22if(ZIG_PREFER_CLANG_CPP_DYLIB)
23 find_library(LLVM_LIBRARIES23 find_library(LLVM_LIBRARIES
24 NAMES24 NAMES
25 LLVM-13.025 LLVM-14.0
26 LLVM-1326 LLVM-14
27 LLVM-13027 LLVM-140
28 LLVM28 LLVM
29 PATHS29 PATHS
30 ${LLVM_LIBDIRS}30 ${LLVM_LIBDIRS}
31 /usr/lib/llvm/13/lib31 /usr/lib/llvm/14/lib
32 /usr/lib/llvm/13/lib6432 /usr/lib/llvm/14/lib64
33 /usr/lib/llvm-13/lib33 /usr/lib/llvm-14/lib
34 /usr/local/llvm13/lib34 /usr/local/llvm14/lib
35 /usr/local/llvm130/lib35 /usr/local/llvm140/lib
36 /usr/local/opt/llvm@13/lib36 /usr/local/opt/llvm@14/lib
37 /opt/homebrew/opt/llvm@13/lib37 /opt/homebrew/opt/llvm@14/lib
38 )38 )
3939
40 find_program(LLVM_CONFIG_EXE40 find_program(LLVM_CONFIG_EXE
41 NAMES llvm-config-13 llvm-config-13.0 llvm-config130 llvm-config13 llvm-config41 NAMES llvm-config-14 llvm-config-14.0 llvm-config140 llvm-config14 llvm-config
42 PATHS42 PATHS
43 "/mingw64/bin"43 "/mingw64/bin"
44 "/c/msys64/mingw64/bin"44 "/c/msys64/mingw64/bin"
45 "c:/msys64/mingw64/bin"45 "c:/msys64/mingw64/bin"
46 "C:/Libraries/llvm-13.0.0/bin")46 "C:/Libraries/llvm-14.0.0/bin")
4747
48 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")48 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
49 message(FATAL_ERROR "unable to find llvm-config")49 message(FATAL_ERROR "unable to find llvm-config")
...@@ -58,23 +58,23 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)...@@ -58,23 +58,23 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)
58 OUTPUT_VARIABLE LLVM_CONFIG_VERSION58 OUTPUT_VARIABLE LLVM_CONFIG_VERSION
59 OUTPUT_STRIP_TRAILING_WHITESPACE)59 OUTPUT_STRIP_TRAILING_WHITESPACE)
6060
61 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 13)61 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 14)
62 message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")62 message(FATAL_ERROR "expected LLVM 14.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
63 endif()63 endif()
64 if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 14)64 if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 15)
65 message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")65 message(FATAL_ERROR "expected LLVM 14.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
66 endif()66 endif()
67 if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 14)67 if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 15)
68 message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")68 message(FATAL_ERROR "expected LLVM 14.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
69 endif()69 endif()
70elseif(ZIG_USE_LLVM_CONFIG)70elseif(ZIG_USE_LLVM_CONFIG)
71 find_program(LLVM_CONFIG_EXE71 find_program(LLVM_CONFIG_EXE
72 NAMES llvm-config-13 llvm-config-13.0 llvm-config130 llvm-config13 llvm-config72 NAMES llvm-config-14 llvm-config-14.0 llvm-config140 llvm-config14 llvm-config
73 PATHS73 PATHS
74 "/mingw64/bin"74 "/mingw64/bin"
75 "/c/msys64/mingw64/bin"75 "/c/msys64/mingw64/bin"
76 "c:/msys64/mingw64/bin"76 "c:/msys64/mingw64/bin"
77 "C:/Libraries/llvm-13.0.0/bin")77 "C:/Libraries/llvm-14.0.0/bin")
7878
79 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")79 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
80 message(FATAL_ERROR "unable to find llvm-config")80 message(FATAL_ERROR "unable to find llvm-config")
...@@ -89,14 +89,14 @@ elseif(ZIG_USE_LLVM_CONFIG)...@@ -89,14 +89,14 @@ elseif(ZIG_USE_LLVM_CONFIG)
89 OUTPUT_VARIABLE LLVM_CONFIG_VERSION89 OUTPUT_VARIABLE LLVM_CONFIG_VERSION
90 OUTPUT_STRIP_TRAILING_WHITESPACE)90 OUTPUT_STRIP_TRAILING_WHITESPACE)
9191
92 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 13)92 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 14)
93 message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")93 message(FATAL_ERROR "expected LLVM 14.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
94 endif()94 endif()
95 if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 14)95 if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 15)
96 message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")96 message(FATAL_ERROR "expected LLVM 14.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
97 endif()97 endif()
98 if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 14)98 if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 15)
99 message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")99 message(FATAL_ERROR "expected LLVM 14.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
100 endif()100 endif()
101101
102 execute_process(102 execute_process(
...@@ -170,7 +170,7 @@ elseif(ZIG_USE_LLVM_CONFIG)...@@ -170,7 +170,7 @@ elseif(ZIG_USE_LLVM_CONFIG)
170 set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})170 set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
171171
172 if(NOT LLVM_LIBRARIES)172 if(NOT LLVM_LIBRARIES)
173 find_library(LLVM_LIBRARIES NAMES LLVM LLVM-13 LLVM-13.0)173 find_library(LLVM_LIBRARIES NAMES LLVM LLVM-14 LLVM-14.0)
174 endif()174 endif()
175175
176 link_directories("${CMAKE_PREFIX_PATH}/lib")176 link_directories("${CMAKE_PREFIX_PATH}/lib")
...@@ -184,13 +184,13 @@ else()...@@ -184,13 +184,13 @@ else()
184 find_library(LLVM_${_prettylibname_}_LIB NAMES ${_libname_}184 find_library(LLVM_${_prettylibname_}_LIB NAMES ${_libname_}
185 PATHS185 PATHS
186 ${LLVM_LIBDIRS}186 ${LLVM_LIBDIRS}
187 /usr/lib/llvm/13/lib187 /usr/lib/llvm/14/lib
188 /usr/lib/llvm-13/lib188 /usr/lib/llvm-14/lib
189 /usr/lib/llvm-13.0/lib189 /usr/lib/llvm-14.0/lib
190 /usr/local/llvm130/lib190 /usr/local/llvm140/lib
191 /usr/local/llvm13/lib191 /usr/local/llvm14/lib
192 /usr/local/opt/llvm@13/lib192 /usr/local/opt/llvm@14/lib
193 /opt/homebrew/opt/llvm@13/lib193 /opt/homebrew/opt/llvm@14/lib
194 /mingw64/lib194 /mingw64/lib
195 /c/msys64/mingw64/lib195 /c/msys64/mingw64/lib
196 c:\\msys64\\mingw64\\lib)196 c:\\msys64\\mingw64\\lib)