Commit 308f72701af0a44bdb2cb2893f3175b7d37f657b | zig

author	Andrew Kelley <andrew@ziglang.org> 2022-02-03 13:38:48-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2022-02-03 13:38:48-07:00
log	308f72701af0a44bdb2cb2893f3175b7d37f657b
tree	0f05f64892186d93d8cc089cd3950aacb3e55523
parent	3832b582292d3065f600e7c7a8393c411e6cdb0a

update cmake files to LLVM 14

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

cmake

cmake/Findclang.cmake+23-23

...	...	@@ -9,31 +9,31 @@
9	9
10	10	find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
11	11	PATHS
12		/usr/lib/llvm/13/include
13		/usr/lib/llvm-13/include
14		/usr/lib/llvm-13.0/include
15		/usr/local/llvm130/include
16		/usr/local/llvm13/include
17		/usr/local/opt/llvm@13/include
18		/opt/homebrew/opt/llvm@13/include
	12	/usr/lib/llvm/14/include
	13	/usr/lib/llvm-14/include
	14	/usr/lib/llvm-14.0/include
	15	/usr/local/llvm140/include
	16	/usr/local/llvm14/include
	17	/usr/local/opt/llvm@14/include
	18	/opt/homebrew/opt/llvm@14/include
19	19	/mingw64/include
20	20	)
21	21
22	22	if(ZIG_PREFER_CLANG_CPP_DYLIB)
23	23	find_library(CLANG_LIBRARIES
24	24	NAMES
25		clang-cpp-13.0
26		clang-cpp130
	25	clang-cpp-14.0
	26	clang-cpp140
27	27	clang-cpp
28	28	PATHS
29	29	${CLANG_LIBDIRS}
30		/usr/lib/llvm/13/lib
31		/usr/lib/llvm/13/lib64
32		/usr/lib/llvm-13/lib
33		/usr/local/llvm130/lib
34		/usr/local/llvm13/lib
35		/usr/local/opt/llvm@13/lib
36		/opt/homebrew/opt/llvm@13/lib
	30	/usr/lib/llvm/14/lib
	31	/usr/lib/llvm/14/lib64
	32	/usr/lib/llvm-14/lib
	33	/usr/local/llvm140/lib
	34	/usr/local/llvm14/lib
	35	/usr/local/opt/llvm@14/lib
	36	/opt/homebrew/opt/llvm@14/lib
37	37	)
38	38	endif()
39	39
...	...	@@ -43,13 +43,13 @@ if(NOT CLANG_LIBRARIES)
43	43	find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
44	44	PATHS
45	45	${CLANG_LIBDIRS}
46		/usr/lib/llvm/13/lib
47		/usr/lib/llvm-13/lib
48		/usr/lib/llvm-13.0/lib
49		/usr/local/llvm130/lib
50		/usr/local/llvm13/lib
51		/usr/local/opt/llvm@13/lib
52		/opt/homebrew/opt/llvm@13/lib
	46	/usr/lib/llvm/14/lib
	47	/usr/lib/llvm-14/lib
	48	/usr/lib/llvm-14.0/lib
	49	/usr/local/llvm140/lib
	50	/usr/local/llvm14/lib
	51	/usr/local/opt/llvm@14/lib
	52	/opt/homebrew/opt/llvm@14/lib
53	53	/mingw64/lib
54	54	/c/msys64/mingw64/lib
55	55	c:\\msys64\\mingw64\\lib

cmake/Findlld.cmake+16-16

...	...	@@ -8,20 +8,20 @@
8	8
9	9	find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
10	10	PATHS
11		/usr/lib/llvm-13/include
12		/usr/local/llvm130/include
13		/usr/local/llvm13/include
14		/usr/local/opt/llvm@13/include
15		/opt/homebrew/opt/llvm@13/include
	11	/usr/lib/llvm-14/include
	12	/usr/local/llvm140/include
	13	/usr/local/llvm14/include
	14	/usr/local/opt/llvm@14/include
	15	/opt/homebrew/opt/llvm@14/include
16	16	/mingw64/include)
17	17
18		find_library(LLD_LIBRARY NAMES lld-13.0 lld130 lld
	18	find_library(LLD_LIBRARY NAMES lld-14.0 lld140 lld
19	19	PATHS
20		/usr/lib/llvm-13/lib
21		/usr/local/llvm130/lib
22		/usr/local/llvm13/lib
23		/usr/local/opt/llvm@13/lib
24		/opt/homebrew/opt/llvm@13/lib
	20	/usr/lib/llvm-14/lib
	21	/usr/local/llvm140/lib
	22	/usr/local/llvm14/lib
	23	/usr/local/opt/llvm@14/lib
	24	/opt/homebrew/opt/llvm@14/lib
25	25	)
26	26	if(EXISTS ${LLD_LIBRARY})
27	27	set(LLD_LIBRARIES ${LLD_LIBRARY})
...	...	@@ -31,11 +31,11 @@ else()
31	31	find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
32	32	PATHS
33	33	${LLD_LIBDIRS}
34		/usr/lib/llvm-13/lib
35		/usr/local/llvm130/lib
36		/usr/local/llvm13/lib
37		/usr/local/opt/llvm@13/lib
38		/opt/homebrew/opt/llvm@13/lib
	34	/usr/lib/llvm-14/lib
	35	/usr/local/llvm140/lib
	36	/usr/local/llvm14/lib
	37	/usr/local/opt/llvm@14/lib
	38	/opt/homebrew/opt/llvm@14/lib
39	39	/mingw64/lib
40	40	/c/msys64/mingw64/lib
41	41	c:/msys64/mingw64/lib)

cmake/Findllvm.cmake+41-41

...	...	@@ -9,41 +9,41 @@
9	9
10	10	find_path(LLVM_INCLUDE_DIRS NAMES llvm/IR/IRBuilder.h
11	11	PATHS
12		/usr/lib/llvm/13/include
13		/usr/lib/llvm-13/include
14		/usr/lib/llvm-13.0/include
15		/usr/local/llvm13/include
16		/usr/local/llvm130/include
17		/usr/local/opt/llvm@13/include
18		/opt/homebrew/opt/llvm@13/include
	12	/usr/lib/llvm/14/include
	13	/usr/lib/llvm-14/include
	14	/usr/lib/llvm-14.0/include
	15	/usr/local/llvm14/include
	16	/usr/local/llvm140/include
	17	/usr/local/opt/llvm@14/include
	18	/opt/homebrew/opt/llvm@14/include
19	19	/mingw64/include
20	20	)
21	21
22	22	if(ZIG_PREFER_CLANG_CPP_DYLIB)
23	23	find_library(LLVM_LIBRARIES
24	24	NAMES
25		LLVM-13.0
26		LLVM-13
27		LLVM-130
	25	LLVM-14.0
	26	LLVM-14
	27	LLVM-140
28	28	LLVM
29	29	PATHS
30	30	${LLVM_LIBDIRS}
31		/usr/lib/llvm/13/lib
32		/usr/lib/llvm/13/lib64
33		/usr/lib/llvm-13/lib
34		/usr/local/llvm13/lib
35		/usr/local/llvm130/lib
36		/usr/local/opt/llvm@13/lib
37		/opt/homebrew/opt/llvm@13/lib
	31	/usr/lib/llvm/14/lib
	32	/usr/lib/llvm/14/lib64
	33	/usr/lib/llvm-14/lib
	34	/usr/local/llvm14/lib
	35	/usr/local/llvm140/lib
	36	/usr/local/opt/llvm@14/lib
	37	/opt/homebrew/opt/llvm@14/lib
38	38	)
39	39
40	40	find_program(LLVM_CONFIG_EXE
41		NAMES llvm-config-13 llvm-config-13.0 llvm-config130 llvm-config13 llvm-config
	41	NAMES llvm-config-14 llvm-config-14.0 llvm-config140 llvm-config14 llvm-config
42	42	PATHS
43	43	"/mingw64/bin"
44	44	"/c/msys64/mingw64/bin"
45	45	"c:/msys64/mingw64/bin"
46		"C:/Libraries/llvm-13.0.0/bin")
	46	"C:/Libraries/llvm-14.0.0/bin")
47	47
48	48	if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
49	49	message(FATAL_ERROR "unable to find llvm-config")
...	...	@@ -58,23 +58,23 @@ if(ZIG_PREFER_CLANG_CPP_DYLIB)
58	58	OUTPUT_VARIABLE LLVM_CONFIG_VERSION
59	59	OUTPUT_STRIP_TRAILING_WHITESPACE)
60	60
61		if("${LLVM_CONFIG_VERSION}" VERSION_LESS 13)
62		message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
	61	if("${LLVM_CONFIG_VERSION}" VERSION_LESS 14)
	62	message(FATAL_ERROR "expected LLVM 14.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
63	63	endif()
64		if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 14)
65		message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
	64	if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 15)
	65	message(FATAL_ERROR "expected LLVM 14.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
66	66	endif()
67		if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 14)
68		message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
	67	if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 15)
	68	message(FATAL_ERROR "expected LLVM 14.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
69	69	endif()
70	70	elseif(ZIG_USE_LLVM_CONFIG)
71	71	find_program(LLVM_CONFIG_EXE
72		NAMES llvm-config-13 llvm-config-13.0 llvm-config130 llvm-config13 llvm-config
	72	NAMES llvm-config-14 llvm-config-14.0 llvm-config140 llvm-config14 llvm-config
73	73	PATHS
74	74	"/mingw64/bin"
75	75	"/c/msys64/mingw64/bin"
76	76	"c:/msys64/mingw64/bin"
77		"C:/Libraries/llvm-13.0.0/bin")
	77	"C:/Libraries/llvm-14.0.0/bin")
78	78
79	79	if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
80	80	message(FATAL_ERROR "unable to find llvm-config")
...	...	@@ -89,14 +89,14 @@ elseif(ZIG_USE_LLVM_CONFIG)
89	89	OUTPUT_VARIABLE LLVM_CONFIG_VERSION
90	90	OUTPUT_STRIP_TRAILING_WHITESPACE)
91	91
92		if("${LLVM_CONFIG_VERSION}" VERSION_LESS 13)
93		message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
	92	if("${LLVM_CONFIG_VERSION}" VERSION_LESS 14)
	93	message(FATAL_ERROR "expected LLVM 14.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
94	94	endif()
95		if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 14)
96		message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
	95	if("${LLVM_CONFIG_VERSION}" VERSION_EQUAL 15)
	96	message(FATAL_ERROR "expected LLVM 14.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
97	97	endif()
98		if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 14)
99		message(FATAL_ERROR "expected LLVM 13.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
	98	if("${LLVM_CONFIG_VERSION}" VERSION_GREATER 15)
	99	message(FATAL_ERROR "expected LLVM 14.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
100	100	endif()
101	101
102	102	execute_process(
...	...	@@ -170,7 +170,7 @@ elseif(ZIG_USE_LLVM_CONFIG)
170	170	set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
171	171
172	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	174	endif()
175	175
176	176	link_directories("${CMAKE_PREFIX_PATH}/lib")
...	...	@@ -184,13 +184,13 @@ else()
184	184	find_library(LLVM_${_prettylibname_}_LIB NAMES ${_libname_}
185	185	PATHS
186	186	${LLVM_LIBDIRS}
187		/usr/lib/llvm/13/lib
188		/usr/lib/llvm-13/lib
189		/usr/lib/llvm-13.0/lib
190		/usr/local/llvm130/lib
191		/usr/local/llvm13/lib
192		/usr/local/opt/llvm@13/lib
193		/opt/homebrew/opt/llvm@13/lib
	187	/usr/lib/llvm/14/lib
	188	/usr/lib/llvm-14/lib
	189	/usr/lib/llvm-14.0/lib
	190	/usr/local/llvm140/lib
	191	/usr/local/llvm14/lib
	192	/usr/local/opt/llvm@14/lib
	193	/opt/homebrew/opt/llvm@14/lib
194	194	/mingw64/lib
195	195	/c/msys64/mingw64/lib
196	196	c:\\msys64\\mingw64\\lib)