Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: prefer llvm-config

master
Andrew Kelley 2016-02-01 22:38:55 -07:00
parent 0216293430
commit fc5ffd32e9
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -152,8 +152,8 @@ add_executable(zig ${ZIG_SOURCES})
set_target_properties(zig PROPERTIES
COMPILE_FLAGS ${EXE_CFLAGS})
target_link_libraries(zig LINK_PUBLIC
${LLVM_LIBRARIES}
${CLANG_LIBRARIES}
${LLVM_LIBRARIES}
)
install(TARGETS zig DESTINATION bin)

6
cmake/Findllvm.cmake
View File

@ -11,11 +11,6 @@ find_path(LLVM_C_INCLUDE_DIR NAMES llvm-c/Core.h PATHS /usr/include/llvm-c-3.7/)
find_path(LLVM_INCLUDE_DIR NAMES llvm/IR/IRBuilder.h PATHS /usr/include/llvm-3.7/)
set(LLVM_INCLUDE_DIRS ${LLVM_C_INCLUDE_DIR} ${LLVM_INCLUDE_DIR})
find_library(LLVM_LIBRARY NAMES LLVM)
if(LLVM_LIBRARY)
set(LLVM_LIBRARIES ${LLVM_LIBRARY})
set(LLVM_LIBDIRS "")
else()
find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-3.7)
execute_process(
@ -34,7 +29,6 @@ else()
OUTPUT_STRIP_TRAILING_WHITESPACE)
set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS})
endif()
include(FindPackageHandleStandardArgs)