authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-02-15 15:50:06-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-02-15 15:52:19-07:00
log3664e8e4e2478b129f128dfa49ae13d376651500
tree6f472f2634c8291eda9a3e916c597ab696422c3b
parentfecbc91a6b6fec655f4fb0c9b6c6fb71f8989f39

use llvm-config to find llvm include dirs

2 files changed, 10 insertions(+), 8 deletions(-)

CMakeLists.txt+1-1
...@@ -23,7 +23,7 @@ set(ZIG_DYNAMIC_LINKER "" CACHE STRING "Override dynamic linker for native targe...@@ -23,7 +23,7 @@ set(ZIG_DYNAMIC_LINKER "" CACHE STRING "Override dynamic linker for native targe
2323
2424
25find_package(llvm)25find_package(llvm)
26include_directories(${LLVM_INCLUDE_DIRS})26include_directories(${LLVM_INCLUDE_DIR})
27link_directories(${LLVM_LIBDIRS})27link_directories(${LLVM_LIBDIRS})
2828
29find_package(clang)29find_package(clang)
cmake/Findllvm.cmake+9-7
...@@ -3,14 +3,10 @@...@@ -3,14 +3,10 @@
3# See http://opensource.org/licenses/MIT3# See http://opensource.org/licenses/MIT
44
5# LLVM_FOUND5# LLVM_FOUND
6# LLVM_INCLUDE_DIRS6# LLVM_INCLUDE_DIR
7# LLVM_LIBRARIES7# LLVM_LIBRARIES
8# LLVM_LIBDIRS8# LLVM_LIBDIRS
99
10find_path(LLVM_C_INCLUDE_DIR NAMES llvm-c/Core.h PATHS /usr/include/llvm-c-3.7/)
11find_path(LLVM_INCLUDE_DIR NAMES llvm/IR/IRBuilder.h PATHS /usr/include/llvm-3.7/)
12set(LLVM_INCLUDE_DIRS ${LLVM_C_INCLUDE_DIR} ${LLVM_INCLUDE_DIR})
13
14find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-3.7)10find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-3.7)
1511
16execute_process(12execute_process(
...@@ -28,10 +24,16 @@ execute_process(...@@ -28,10 +24,16 @@ execute_process(
28 OUTPUT_VARIABLE LLVM_LIBDIRS24 OUTPUT_VARIABLE LLVM_LIBDIRS
29 OUTPUT_STRIP_TRAILING_WHITESPACE)25 OUTPUT_STRIP_TRAILING_WHITESPACE)
3026
27execute_process(
28 COMMAND ${LLVM_CONFIG_EXE} --includedir
29 OUTPUT_VARIABLE LLVM_INCLUDE_DIR
30 OUTPUT_STRIP_TRAILING_WHITESPACE)
31
32
31set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})33set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
3234
3335
34include(FindPackageHandleStandardArgs)36include(FindPackageHandleStandardArgs)
35find_package_handle_standard_args(LLVM DEFAULT_MSG LLVM_LIBRARIES LLVM_INCLUDE_DIRS)37find_package_handle_standard_args(LLVM DEFAULT_MSG LLVM_LIBRARIES LLVM_INCLUDE_DIR)
3638
37mark_as_advanced(LLVM_INCLUDE_DIRS LLVM_LIBRARIES LLVM_LIBDIRS)39mark_as_advanced(LLVM_INCLUDE_DIR LLVM_LIBRARIES LLVM_LIBDIRS)