Commit 453439a964035507309eb57245f337d38d88ff7f | zig

author	Andrew Kelley <andrew@ziglang.org> 2018-03-17 14:43:26-04:00
committer	GitHub <noreply@github.com> 2018-03-17 14:43:26-04:00
log	453439a964035507309eb57245f337d38d88ff7f
tree	fe8860e95c26881186ae8172106584aba3bbe4eb
parent	f073923ea08a123402ae2e3ed3db716f120827d4
parent	c2c34c09b9afd8a5370dce771d5e98af5b3303a1
signature	Signed by PGP key 4AEE18F83AFDEB23

add CLANG_LIBDIRS cmake build variable

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

cmake/Findclang.cmake+3-1

...	...	@@ -5,6 +5,7 @@
5	5	# CLANG_FOUND
6	6	# CLANG_INCLUDE_DIRS
7	7	# CLANG_LIBRARIES
	8	# CLANG_LIBDIRS
8	9
9	10	if(MSVC)
10	11	find_package(CLANG REQUIRED CONFIG)
...	...	@@ -34,6 +35,7 @@ else()
34	35	string(TOUPPER ${_libname_} _prettylibname_)
35	36	find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
36	37	PATHS
	38	${CLANG_LIBDIRS}
37	39	/usr/lib/llvm/6/lib
38	40	/usr/lib/llvm-6.0/lib
39	41	/mingw64/lib
...	...	@@ -60,4 +62,4 @@ endif()
60	62	include(FindPackageHandleStandardArgs)
61	63	find_package_handle_standard_args(CLANG DEFAULT_MSG CLANG_LIBRARIES CLANG_INCLUDE_DIRS)
62	64
63		mark_as_advanced(CLANG_INCLUDE_DIRS CLANG_LIBRARIES)
	65	mark_as_advanced(CLANG_INCLUDE_DIRS CLANG_LIBRARIES CLANG_LIBDIRS)

cmake/Findllvm.cmake+1-1

...	...	@@ -66,7 +66,7 @@ if(NOT LLVM_LIBRARIES)
66	66	endif()
67	67
68	68	link_directories("${CMAKE_PREFIX_PATH}/lib")
69
	69	link_directories("${LLVM_LIBDIRS}")
70	70
71	71	include(FindPackageHandleStandardArgs)
72	72	find_package_handle_standard_args(LLVM DEFAULT_MSG LLVM_LIBRARIES LLVM_INCLUDE_DIRS)