authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-02-01 22:38:55-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-02-01 22:38:55-07:00
logfc5ffd32e99bfac6bbf6f5f77804c3c5ebe9ae88
treedf2556d8db8050b957208640a099ae758f731d84
parent02162934306fb72474671367254fd50763a390d4

build: prefer llvm-config

2 files changed, 19 insertions(+), 25 deletions(-)

CMakeLists.txt+1-1
...@@ -152,8 +152,8 @@ add_executable(zig ${ZIG_SOURCES})...@@ -152,8 +152,8 @@ add_executable(zig ${ZIG_SOURCES})
152set_target_properties(zig PROPERTIES152set_target_properties(zig PROPERTIES
153 COMPILE_FLAGS ${EXE_CFLAGS})153 COMPILE_FLAGS ${EXE_CFLAGS})
154target_link_libraries(zig LINK_PUBLIC154target_link_libraries(zig LINK_PUBLIC
155 ${LLVM_LIBRARIES}
156 ${CLANG_LIBRARIES}155 ${CLANG_LIBRARIES}
156 ${LLVM_LIBRARIES}
157)157)
158install(TARGETS zig DESTINATION bin)158install(TARGETS zig DESTINATION bin)
159159
cmake/Findllvm.cmake+18-24
...@@ -11,30 +11,24 @@ find_path(LLVM_C_INCLUDE_DIR NAMES llvm-c/Core.h PATHS /usr/include/llvm-c-3.7/)...@@ -11,30 +11,24 @@ find_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/)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})12set(LLVM_INCLUDE_DIRS ${LLVM_C_INCLUDE_DIR} ${LLVM_INCLUDE_DIR})
1313
14find_library(LLVM_LIBRARY NAMES LLVM)14find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-3.7)
15if(LLVM_LIBRARY)15
16 set(LLVM_LIBRARIES ${LLVM_LIBRARY})16execute_process(
17 set(LLVM_LIBDIRS "")17 COMMAND ${LLVM_CONFIG_EXE} --libs
18else()18 OUTPUT_VARIABLE LLVM_LIBRARIES
19 find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-3.7)19 OUTPUT_STRIP_TRAILING_WHITESPACE)
2020
21 execute_process(21execute_process(
22 COMMAND ${LLVM_CONFIG_EXE} --libs22 COMMAND ${LLVM_CONFIG_EXE} --system-libs
23 OUTPUT_VARIABLE LLVM_LIBRARIES23 OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
24 OUTPUT_STRIP_TRAILING_WHITESPACE)24 OUTPUT_STRIP_TRAILING_WHITESPACE)
2525
26 execute_process(26execute_process(
27 COMMAND ${LLVM_CONFIG_EXE} --system-libs27 COMMAND ${LLVM_CONFIG_EXE} --libdir
28 OUTPUT_VARIABLE LLVM_SYSTEM_LIBS28 OUTPUT_VARIABLE LLVM_LIBDIRS
29 OUTPUT_STRIP_TRAILING_WHITESPACE)29 OUTPUT_STRIP_TRAILING_WHITESPACE)
3030
31 execute_process(31set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
32 COMMAND ${LLVM_CONFIG_EXE} --libdir
33 OUTPUT_VARIABLE LLVM_LIBDIRS
34 OUTPUT_STRIP_TRAILING_WHITESPACE)
35
36 set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
37endif()
3832
3933
40include(FindPackageHandleStandardArgs)34include(FindPackageHandleStandardArgs)