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

fix cmake finding dependencies for ubuntu

Browse Source
This commit is contained in:
Josh Wolfe 2017-03-29 22:18:12 -07:00
parent f48f7f43fe
commit 536c35136a
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -34,6 +34,8 @@ include_directories(${CLANG_INCLUDE_DIRS})
find_package(lld) find_package(lld)
include_directories(${LLD_INCLUDE_DIRS}) include_directories(${LLD_INCLUDE_DIRS})
find_package(Threads)
include_directories( include_directories(
${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
@ -196,6 +198,7 @@ target_link_libraries(zig LINK_PUBLIC
${CLANG_LIBRARIES} ${CLANG_LIBRARIES}
${LLD_LIBRARIES} ${LLD_LIBRARIES}
${LLVM_LIBRARIES} ${LLVM_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
) )
install(TARGETS zig DESTINATION bin) install(TARGETS zig DESTINATION bin)

4
cmake/Findclang.cmake
View File

@ -8,14 +8,14 @@
find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
PATHS PATHS
/usr/lib/llvm-4/include /usr/lib/llvm-4.0/include
/mingw64/include) /mingw64/include)
macro(FIND_AND_ADD_CLANG_LIB _libname_) macro(FIND_AND_ADD_CLANG_LIB _libname_)
string(TOUPPER ${_libname_} _prettylibname_) string(TOUPPER ${_libname_} _prettylibname_)
find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
PATHS PATHS
/usr/lib/llvm-4/lib /usr/lib/llvm-4.0/lib
/mingw64/lib) /mingw64/lib)
if(CLANG_${_prettylibname_}_LIB) if(CLANG_${_prettylibname_}_LIB)
set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_${_prettylibname_}_LIB}) set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_${_prettylibname_}_LIB})

4
cmake/Findlld.cmake
View File

@ -8,14 +8,14 @@
find_path(LLD_INCLUDE_DIRS NAMES lld/Driver/Driver.h find_path(LLD_INCLUDE_DIRS NAMES lld/Driver/Driver.h
PATHS PATHS
/usr/lib/llvm-4/include /usr/lib/llvm-4.0/include
/mingw64/include) /mingw64/include)
macro(FIND_AND_ADD_LLD_LIB _libname_) macro(FIND_AND_ADD_LLD_LIB _libname_)
string(TOUPPER ${_libname_} _prettylibname_) string(TOUPPER ${_libname_} _prettylibname_)
find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_} find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
PATHS PATHS
/usr/lib/llvm-4/lib /usr/lib/llvm-4.0/lib
/mingw64/lib) /mingw64/lib)
if(LLD_${_prettylibname_}_LIB) if(LLD_${_prettylibname_}_LIB)
set(LLD_LIBRARIES ${LLD_LIBRARIES} ${LLD_${_prettylibname_}_LIB}) set(LLD_LIBRARIES ${LLD_LIBRARIES} ${LLD_${_prettylibname_}_LIB})

2
cmake/Findllvm.cmake
View File

@ -7,7 +7,7 @@
# LLVM_LIBRARIES # LLVM_LIBRARIES
# LLVM_LIBDIRS # LLVM_LIBDIRS
find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-4) find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-4.0)
execute_process( execute_process(
COMMAND ${LLVM_CONFIG_EXE} --libs COMMAND ${LLVM_CONFIG_EXE} --libs