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 @@
99
1010find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
1111 PATHS
12 /usr/lib/llvm/11/include
13 /usr/lib/llvm-11/include
14 /usr/lib/llvm-11.0/include
15 /usr/local/llvm110/include
16 /usr/local/llvm11/include
12 /usr/lib/llvm/12/include
13 /usr/lib/llvm-12/include
14 /usr/lib/llvm-12.0/include
15 /usr/local/llvm120/include
16 /usr/local/llvm12/include
1717 /mingw64/include
1818)
1919
2020if(ZIG_PREFER_CLANG_CPP_DYLIB)
2121 find_library(CLANG_LIBRARIES
2222 NAMES
23 clang-cpp-11.0
24 clang-cpp110
23 clang-cpp-12.0
24 clang-cpp120
2525 clang-cpp
2626 PATHS
2727 ${CLANG_LIBDIRS}
28 /usr/lib/llvm/11/lib
29 /usr/lib/llvm/11/lib64
30 /usr/lib/llvm-11/lib
31 /usr/local/llvm110/lib
32 /usr/local/llvm11/lib
28 /usr/lib/llvm/12/lib
29 /usr/lib/llvm/12/lib64
30 /usr/lib/llvm-12/lib
31 /usr/local/llvm120/lib
32 /usr/local/llvm12/lib
3333 )
3434endif()
3535
......@@ -39,11 +39,11 @@ if(NOT CLANG_LIBRARIES)
3939 find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
4040 PATHS
4141 ${CLANG_LIBDIRS}
42 /usr/lib/llvm/11/lib
43 /usr/lib/llvm-11/lib
44 /usr/lib/llvm-11.0/lib
45 /usr/local/llvm110/lib
46 /usr/local/llvm11/lib
42 /usr/lib/llvm/12/lib
43 /usr/lib/llvm-12/lib
44 /usr/lib/llvm-12.0/lib
45 /usr/local/llvm120/lib
46 /usr/local/llvm12/lib
4747 /mingw64/lib
4848 /c/msys64/mingw64/lib
4949 c:\\msys64\\mingw64\\lib
cmake/Findlld.cmake+10-10
......@@ -8,16 +8,16 @@
88
99find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
1010 PATHS
11 /usr/lib/llvm-11/include
12 /usr/local/llvm110/include
13 /usr/local/llvm11/include
11 /usr/lib/llvm-12/include
12 /usr/local/llvm120/include
13 /usr/local/llvm12/include
1414 /mingw64/include)
1515
16find_library(LLD_LIBRARY NAMES lld-11.0 lld110 lld
16find_library(LLD_LIBRARY NAMES lld-12.0 lld120 lld
1717 PATHS
18 /usr/lib/llvm-11/lib
19 /usr/local/llvm110/lib
20 /usr/local/llvm11/lib
18 /usr/lib/llvm-12/lib
19 /usr/local/llvm120/lib
20 /usr/local/llvm12/lib
2121)
2222if(EXISTS ${LLD_LIBRARY})
2323 set(LLD_LIBRARIES ${LLD_LIBRARY})
......@@ -27,9 +27,9 @@ else()
2727 find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
2828 PATHS
2929 ${LLD_LIBDIRS}
30 /usr/lib/llvm-11/lib
31 /usr/local/llvm110/lib
32 /usr/local/llvm11/lib
30 /usr/lib/llvm-12/lib
31 /usr/local/llvm120/lib
32 /usr/local/llvm12/lib
3333 /mingw64/lib
3434 /c/msys64/mingw64/lib
3535 c:/msys64/mingw64/lib)
cmake/Findllvm.cmake+35-35
......@@ -9,37 +9,37 @@
99
1010find_path(LLVM_INCLUDE_DIRS NAMES llvm/IR/IRBuilder.h
1111 PATHS
12 /usr/lib/llvm/11/include
13 /usr/lib/llvm-11/include
14 /usr/lib/llvm-11.0/include
15 /usr/local/llvm11/include
16 /usr/local/llvm110/include
12 /usr/lib/llvm/12/include
13 /usr/lib/llvm-12/include
14 /usr/lib/llvm-12.0/include
15 /usr/local/llvm12/include
16 /usr/local/llvm120/include
1717 /mingw64/include
1818)
1919
2020if(ZIG_PREFER_CLANG_CPP_DYLIB)
2121 find_library(LLVM_LIBRARIES
2222 NAMES
23 LLVM-11.0
24 LLVM-11
25 LLVM-110
23 LLVM-12.0
24 LLVM-12
25 LLVM-120
2626 LLVM
2727 PATHS
2828 ${LLVM_LIBDIRS}
29 /usr/lib/llvm/11/lib
30 /usr/lib/llvm/11/lib64
31 /usr/lib/llvm-11/lib
32 /usr/local/llvm11/lib
33 /usr/local/llvm110/lib
29 /usr/lib/llvm/12/lib
30 /usr/lib/llvm/12/lib64
31 /usr/lib/llvm-12/lib
32 /usr/local/llvm12/lib
33 /usr/local/llvm120/lib
3434 )
3535
3636 find_program(LLVM_CONFIG_EXE
37 NAMES llvm-config-11 llvm-config-11.0 llvm-config110 llvm-config11 llvm-config
37 NAMES llvm-config-12 llvm-config-12.0 llvm-config120 llvm-config12 llvm-config
3838 PATHS
3939 "/mingw64/bin"
4040 "/c/msys64/mingw64/bin"
4141 "c:/msys64/mingw64/bin"
42 "C:/Libraries/llvm-11.0.0/bin")
42 "C:/Libraries/llvm-12.0.0/bin")
4343
4444 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
4545 message(FATAL_ERROR "unable to find llvm-config")
......@@ -54,23 +54,23 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)
5454 OUTPUT_VARIABLE LLVM_CONFIG_VERSION
5555 OUTPUT_STRIP_TRAILING_WHITESPACE)
5656
57 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 11)
58 message(FATAL_ERROR "expected LLVM 11.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
57 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 12)
58 message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
5959 endif()
60 if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 12)
61 message(FATAL_ERROR "expected LLVM 11.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
60 if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 13)
61 message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
6262 endif()
63 if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 12)
64 message(FATAL_ERROR "expected LLVM 11.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
63 if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 13)
64 message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
6565 endif()
6666elseif(("${ZIG_TARGET_TRIPLE}" STREQUAL "native") OR ZIG_PREFER_LLVM_CONFIG)
6767 find_program(LLVM_CONFIG_EXE
68 NAMES llvm-config-11 llvm-config-11.0 llvm-config110 llvm-config11 llvm-config
68 NAMES llvm-config-12 llvm-config-12.0 llvm-config120 llvm-config12 llvm-config
6969 PATHS
7070 "/mingw64/bin"
7171 "/c/msys64/mingw64/bin"
7272 "c:/msys64/mingw64/bin"
73 "C:/Libraries/llvm-11.0.0/bin")
73 "C:/Libraries/llvm-12.0.0/bin")
7474
7575 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
7676 message(FATAL_ERROR "unable to find llvm-config")
......@@ -85,14 +85,14 @@ elseif(("${ZIG_TARGET_TRIPLE}" STREQUAL "native") OR ZIG_PREFER_LLVM_CONFIG)
8585 OUTPUT_VARIABLE LLVM_CONFIG_VERSION
8686 OUTPUT_STRIP_TRAILING_WHITESPACE)
8787
88 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 11)
89 message(FATAL_ERROR "expected LLVM 11.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
88 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 12)
89 message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
9090 endif()
91 if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 12)
92 message(FATAL_ERROR "expected LLVM 11.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
91 if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 13)
92 message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
9393 endif()
94 if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 12)
95 message(FATAL_ERROR "expected LLVM 11.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
94 if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 13)
95 message(FATAL_ERROR "expected LLVM 12.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
9696 endif()
9797
9898 execute_process(
......@@ -166,7 +166,7 @@ elseif(("${ZIG_TARGET_TRIPLE}" STREQUAL "native") OR ZIG_PREFER_LLVM_CONFIG)
166166 set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
167167
168168 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)
170170 endif()
171171
172172 link_directories("${CMAKE_PREFIX_PATH}/lib")
......@@ -180,11 +180,11 @@ else()
180180 find_library(LLVM_${_prettylibname_}_LIB NAMES ${_libname_}
181181 PATHS
182182 ${LLVM_LIBDIRS}
183 /usr/lib/llvm/11/lib
184 /usr/lib/llvm-11/lib
185 /usr/lib/llvm-11.0/lib
186 /usr/local/llvm110/lib
187 /usr/local/llvm11/lib
183 /usr/lib/llvm/12/lib
184 /usr/lib/llvm-12/lib
185 /usr/lib/llvm-12.0/lib
186 /usr/local/llvm120/lib
187 /usr/local/llvm12/lib
188188 /mingw64/lib
189189 /c/msys64/mingw64/lib
190190 c:\\msys64\\mingw64\\lib)