authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-12-16 09:37:32+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-12-16 09:37:32+01:00
log9c2d8056ce177fef2a1b859016b11362686213b1
tree28165489dcb7006bf8fd897b114c8f7e9e313ae5
parentb3c1ced2c37a8265314833fd74a105ca788db927

Update LLVM version numbers in CMake

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

cmake/Findclang.cmake+17-17
...@@ -9,27 +9,27 @@...@@ -9,27 +9,27 @@
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/11/include12 /usr/lib/llvm/12/include
13 /usr/lib/llvm-11/include13 /usr/lib/llvm-12/include
14 /usr/lib/llvm-11.0/include14 /usr/lib/llvm-12.0/include
15 /usr/local/llvm110/include15 /usr/local/llvm120/include
16 /usr/local/llvm11/include16 /usr/local/llvm12/include
17 /mingw64/include17 /mingw64/include
18)18)
1919
20if(ZIG_PREFER_CLANG_CPP_DYLIB)20if(ZIG_PREFER_CLANG_CPP_DYLIB)
21 find_library(CLANG_LIBRARIES21 find_library(CLANG_LIBRARIES
22 NAMES22 NAMES
23 clang-cpp-11.023 clang-cpp-12.0
24 clang-cpp11024 clang-cpp120
25 clang-cpp25 clang-cpp
26 PATHS26 PATHS
27 ${CLANG_LIBDIRS}27 ${CLANG_LIBDIRS}
28 /usr/lib/llvm/11/lib28 /usr/lib/llvm/12/lib
29 /usr/lib/llvm/11/lib6429 /usr/lib/llvm/12/lib64
30 /usr/lib/llvm-11/lib30 /usr/lib/llvm-12/lib
31 /usr/local/llvm110/lib31 /usr/local/llvm120/lib
32 /usr/local/llvm11/lib32 /usr/local/llvm12/lib
33 )33 )
34endif()34endif()
3535
...@@ -39,11 +39,11 @@ if(NOT CLANG_LIBRARIES)...@@ -39,11 +39,11 @@ if(NOT CLANG_LIBRARIES)
39 find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}39 find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
40 PATHS40 PATHS
41 ${CLANG_LIBDIRS}41 ${CLANG_LIBDIRS}
42 /usr/lib/llvm/11/lib42 /usr/lib/llvm/12/lib
43 /usr/lib/llvm-11/lib43 /usr/lib/llvm-12/lib
44 /usr/lib/llvm-11.0/lib44 /usr/lib/llvm-12.0/lib
45 /usr/local/llvm110/lib45 /usr/local/llvm120/lib
46 /usr/local/llvm11/lib46 /usr/local/llvm12/lib
47 /mingw64/lib47 /mingw64/lib
48 /c/msys64/mingw64/lib48 /c/msys64/mingw64/lib
49 c:\\msys64\\mingw64\\lib49 c:\\msys64\\mingw64\\lib
cmake/Findlld.cmake+10-10
...@@ -8,16 +8,16 @@...@@ -8,16 +8,16 @@
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-11/include11 /usr/lib/llvm-12/include
12 /usr/local/llvm110/include12 /usr/local/llvm120/include
13 /usr/local/llvm11/include13 /usr/local/llvm12/include
14 /mingw64/include)14 /mingw64/include)
1515
16find_library(LLD_LIBRARY NAMES lld-11.0 lld110 lld16find_library(LLD_LIBRARY NAMES lld-12.0 lld120 lld
17 PATHS17 PATHS
18 /usr/lib/llvm-11/lib18 /usr/lib/llvm-12/lib
19 /usr/local/llvm110/lib19 /usr/local/llvm120/lib
20 /usr/local/llvm11/lib20 /usr/local/llvm12/lib
21)21)
22if(EXISTS ${LLD_LIBRARY})22if(EXISTS ${LLD_LIBRARY})
23 set(LLD_LIBRARIES ${LLD_LIBRARY})23 set(LLD_LIBRARIES ${LLD_LIBRARY})
...@@ -27,9 +27,9 @@ else()...@@ -27,9 +27,9 @@ else()
27 find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}27 find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
28 PATHS28 PATHS
29 ${LLD_LIBDIRS}29 ${LLD_LIBDIRS}
30 /usr/lib/llvm-11/lib30 /usr/lib/llvm-12/lib
31 /usr/local/llvm110/lib31 /usr/local/llvm120/lib
32 /usr/local/llvm11/lib32 /usr/local/llvm12/lib
33 /mingw64/lib33 /mingw64/lib
34 /c/msys64/mingw64/lib34 /c/msys64/mingw64/lib
35 c:/msys64/mingw64/lib)35 c:/msys64/mingw64/lib)
cmake/Findllvm.cmake+35-35
...@@ -9,37 +9,37 @@...@@ -9,37 +9,37 @@
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/11/include12 /usr/lib/llvm/12/include
13 /usr/lib/llvm-11/include13 /usr/lib/llvm-12/include
14 /usr/lib/llvm-11.0/include14 /usr/lib/llvm-12.0/include
15 /usr/local/llvm11/include15 /usr/local/llvm12/include
16 /usr/local/llvm110/include16 /usr/local/llvm120/include
17 /mingw64/include17 /mingw64/include
18)18)
1919
20if(ZIG_PREFER_CLANG_CPP_DYLIB)20if(ZIG_PREFER_CLANG_CPP_DYLIB)
21 find_library(LLVM_LIBRARIES21 find_library(LLVM_LIBRARIES
22 NAMES22 NAMES
23 LLVM-11.023 LLVM-12.0
24 LLVM-1124 LLVM-12
25 LLVM-11025 LLVM-120
26 LLVM26 LLVM
27 PATHS27 PATHS
28 ${LLVM_LIBDIRS}28 ${LLVM_LIBDIRS}
29 /usr/lib/llvm/11/lib29 /usr/lib/llvm/12/lib
30 /usr/lib/llvm/11/lib6430 /usr/lib/llvm/12/lib64
31 /usr/lib/llvm-11/lib31 /usr/lib/llvm-12/lib
32 /usr/local/llvm11/lib32 /usr/local/llvm12/lib
33 /usr/local/llvm110/lib33 /usr/local/llvm120/lib
34 )34 )
3535
36 find_program(LLVM_CONFIG_EXE36 find_program(LLVM_CONFIG_EXE
37 NAMES llvm-config-11 llvm-config-11.0 llvm-config110 llvm-config11 llvm-config37 NAMES llvm-config-12 llvm-config-12.0 llvm-config120 llvm-config12 llvm-config
38 PATHS38 PATHS
39 "/mingw64/bin"39 "/mingw64/bin"
40 "/c/msys64/mingw64/bin"40 "/c/msys64/mingw64/bin"
41 "c:/msys64/mingw64/bin"41 "c:/msys64/mingw64/bin"
42 "C:/Libraries/llvm-11.0.0/bin")42 "C:/Libraries/llvm-12.0.0/bin")
4343
44 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")44 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
45 message(FATAL_ERROR "unable to find llvm-config")45 message(FATAL_ERROR "unable to find llvm-config")
...@@ -54,23 +54,23 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)...@@ -54,23 +54,23 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)
54 OUTPUT_VARIABLE LLVM_CONFIG_VERSION54 OUTPUT_VARIABLE LLVM_CONFIG_VERSION
55 OUTPUT_STRIP_TRAILING_WHITESPACE)55 OUTPUT_STRIP_TRAILING_WHITESPACE)
5656
57 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 11)57 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 12)
58 message(FATAL_ERROR "expected LLVM 11.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")58 message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
59 endif()59 endif()
60 if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 12)60 if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 13)
61 message(FATAL_ERROR "expected LLVM 11.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")61 message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
62 endif()62 endif()
63 if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 12)63 if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 13)
64 message(FATAL_ERROR "expected LLVM 11.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")64 message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
65 endif()65 endif()
66elseif(("${ZIG_TARGET_TRIPLE}" STREQUAL "native") OR ZIG_PREFER_LLVM_CONFIG)66elseif(("${ZIG_TARGET_TRIPLE}" STREQUAL "native") OR ZIG_PREFER_LLVM_CONFIG)
67 find_program(LLVM_CONFIG_EXE67 find_program(LLVM_CONFIG_EXE
68 NAMES llvm-config-11 llvm-config-11.0 llvm-config110 llvm-config11 llvm-config68 NAMES llvm-config-12 llvm-config-12.0 llvm-config120 llvm-config12 llvm-config
69 PATHS69 PATHS
70 "/mingw64/bin"70 "/mingw64/bin"
71 "/c/msys64/mingw64/bin"71 "/c/msys64/mingw64/bin"
72 "c:/msys64/mingw64/bin"72 "c:/msys64/mingw64/bin"
73 "C:/Libraries/llvm-11.0.0/bin")73 "C:/Libraries/llvm-12.0.0/bin")
7474
75 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")75 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
76 message(FATAL_ERROR "unable to find llvm-config")76 message(FATAL_ERROR "unable to find llvm-config")
...@@ -85,14 +85,14 @@ elseif(("${ZIG_TARGET_TRIPLE}" STREQUAL "native") OR ZIG_PREFER_LLVM_CONFIG)...@@ -85,14 +85,14 @@ elseif(("${ZIG_TARGET_TRIPLE}" STREQUAL "native") OR ZIG_PREFER_LLVM_CONFIG)
85 OUTPUT_VARIABLE LLVM_CONFIG_VERSION85 OUTPUT_VARIABLE LLVM_CONFIG_VERSION
86 OUTPUT_STRIP_TRAILING_WHITESPACE)86 OUTPUT_STRIP_TRAILING_WHITESPACE)
8787
88 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 11)88 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 12)
89 message(FATAL_ERROR "expected LLVM 11.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")89 message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
90 endif()90 endif()
91 if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 12)91 if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 13)
92 message(FATAL_ERROR "expected LLVM 11.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")92 message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
93 endif()93 endif()
94 if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 12)94 if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 13)
95 message(FATAL_ERROR "expected LLVM 11.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")95 message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
96 endif()96 endif()
9797
98 execute_process(98 execute_process(
...@@ -166,7 +166,7 @@ elseif(("${ZIG_TARGET_TRIPLE}" STREQUAL "native") OR ZIG_PREFER_LLVM_CONFIG)...@@ -166,7 +166,7 @@ elseif(("${ZIG_TARGET_TRIPLE}" STREQUAL "native") OR ZIG_PREFER_LLVM_CONFIG)
166 set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})166 set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
167167
168 if(NOT LLVM_LIBRARIES)168 if(NOT LLVM_LIBRARIES)
169 find_library(LLVM_LIBRARIES NAMES LLVM LLVM-11 LLVM-11.0)169 find_library(LLVM_LIBRARIES NAMES LLVM LLVM-12 LLVM-12.0)
170 endif()170 endif()
171171
172 link_directories("${CMAKE_PREFIX_PATH}/lib")172 link_directories("${CMAKE_PREFIX_PATH}/lib")
...@@ -180,11 +180,11 @@ else()...@@ -180,11 +180,11 @@ else()
180 find_library(LLVM_${_prettylibname_}_LIB NAMES ${_libname_}180 find_library(LLVM_${_prettylibname_}_LIB NAMES ${_libname_}
181 PATHS181 PATHS
182 ${LLVM_LIBDIRS}182 ${LLVM_LIBDIRS}
183 /usr/lib/llvm/11/lib183 /usr/lib/llvm/12/lib
184 /usr/lib/llvm-11/lib184 /usr/lib/llvm-12/lib
185 /usr/lib/llvm-11.0/lib185 /usr/lib/llvm-12.0/lib
186 /usr/local/llvm110/lib186 /usr/local/llvm120/lib
187 /usr/local/llvm11/lib187 /usr/local/llvm12/lib
188 /mingw64/lib188 /mingw64/lib
189 /c/msys64/mingw64/lib189 /c/msys64/mingw64/lib
190 c:\\msys64\\mingw64\\lib)190 c:\\msys64\\mingw64\\lib)