| author |  Josh Wolfe <thejoshwolfe@gmail.com> 2017-03-29 22:18:12-07:00 |
| committer | Josh Wolfe <thejoshwolfe@gmail.com> 2017-03-29 22:18:12-07:00 |
| log | 536c35136ab98f2f56d07937727b3c99c0e35c5c |
| tree | 34da76abd2a1716b4d4340dbce0b9e4776acfd9e |
| parent | f48f7f43fe7095fd13995d838b1452d67fc00ac7 |
fix cmake finding dependencies for ubuntu
4 files changed, 8 insertions(+), 5 deletions(-)
CMakeLists.txt+3
| ... | @@ -34,6 +34,8 @@ include_directories(${CLANG_INCLUDE_DIRS}) | ... | @@ -34,6 +34,8 @@ include_directories(${CLANG_INCLUDE_DIRS}) |
| 34 | find_package(lld) | 34 | find_package(lld) |
| 35 | include_directories(${LLD_INCLUDE_DIRS}) | 35 | include_directories(${LLD_INCLUDE_DIRS}) |
| 36 | 36 | ||
| 37 | find_package(Threads) | ||
| 38 | |||
| 37 | include_directories( | 39 | include_directories( |
| 38 | ${CMAKE_SOURCE_DIR} | 40 | ${CMAKE_SOURCE_DIR} |
| 39 | ${CMAKE_BINARY_DIR} | 41 | ${CMAKE_BINARY_DIR} |
| ... | @@ -196,6 +198,7 @@ target_link_libraries(zig LINK_PUBLIC | ... | @@ -196,6 +198,7 @@ target_link_libraries(zig LINK_PUBLIC |
| 196 | ${CLANG_LIBRARIES} | 198 | ${CLANG_LIBRARIES} |
| 197 | ${LLD_LIBRARIES} | 199 | ${LLD_LIBRARIES} |
| 198 | ${LLVM_LIBRARIES} | 200 | ${LLVM_LIBRARIES} |
| 201 | ${CMAKE_THREAD_LIBS_INIT} | ||
| 199 | ) | 202 | ) |
| 200 | install(TARGETS zig DESTINATION bin) | 203 | install(TARGETS zig DESTINATION bin) |
| 201 | 204 |
cmake/Findclang.cmake+2-2
| ... | @@ -8,14 +8,14 @@ | ... | @@ -8,14 +8,14 @@ |
| 8 | 8 | ||
| 9 | find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h | 9 | find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h |
| 10 | PATHS | 10 | PATHS |
| 11 | /usr/lib/llvm-4/include | 11 | /usr/lib/llvm-4.0/include |
| 12 | /mingw64/include) | 12 | /mingw64/include) |
| 13 | 13 | ||
| 14 | macro(FIND_AND_ADD_CLANG_LIB _libname_) | 14 | macro(FIND_AND_ADD_CLANG_LIB _libname_) |
| 15 | string(TOUPPER ${_libname_} _prettylibname_) | 15 | string(TOUPPER ${_libname_} _prettylibname_) |
| 16 | find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} | 16 | find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} |
| 17 | PATHS | 17 | PATHS |
| 18 | /usr/lib/llvm-4/lib | 18 | /usr/lib/llvm-4.0/lib |
| 19 | /mingw64/lib) | 19 | /mingw64/lib) |
| 20 | if(CLANG_${_prettylibname_}_LIB) | 20 | if(CLANG_${_prettylibname_}_LIB) |
| 21 | set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_${_prettylibname_}_LIB}) | 21 | set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_${_prettylibname_}_LIB}) |
cmake/Findlld.cmake+2-2
| ... | @@ -8,14 +8,14 @@ | ... | @@ -8,14 +8,14 @@ |
| 8 | 8 | ||
| 9 | find_path(LLD_INCLUDE_DIRS NAMES lld/Driver/Driver.h | 9 | find_path(LLD_INCLUDE_DIRS NAMES lld/Driver/Driver.h |
| 10 | PATHS | 10 | PATHS |
| 11 | /usr/lib/llvm-4/include | 11 | /usr/lib/llvm-4.0/include |
| 12 | /mingw64/include) | 12 | /mingw64/include) |
| 13 | 13 | ||
| 14 | macro(FIND_AND_ADD_LLD_LIB _libname_) | 14 | macro(FIND_AND_ADD_LLD_LIB _libname_) |
| 15 | string(TOUPPER ${_libname_} _prettylibname_) | 15 | string(TOUPPER ${_libname_} _prettylibname_) |
| 16 | find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_} | 16 | find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_} |
| 17 | PATHS | 17 | PATHS |
| 18 | /usr/lib/llvm-4/lib | 18 | /usr/lib/llvm-4.0/lib |
| 19 | /mingw64/lib) | 19 | /mingw64/lib) |
| 20 | if(LLD_${_prettylibname_}_LIB) | 20 | if(LLD_${_prettylibname_}_LIB) |
| 21 | set(LLD_LIBRARIES ${LLD_LIBRARIES} ${LLD_${_prettylibname_}_LIB}) | 21 | set(LLD_LIBRARIES ${LLD_LIBRARIES} ${LLD_${_prettylibname_}_LIB}) |
cmake/Findllvm.cmake+1-1
| ... | @@ -7,7 +7,7 @@ | ... | @@ -7,7 +7,7 @@ |
| 7 | # LLVM_LIBRARIES | 7 | # LLVM_LIBRARIES |
| 8 | # LLVM_LIBDIRS | 8 | # LLVM_LIBDIRS |
| 9 | 9 | ||
| 10 | find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-4) | 10 | find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-4.0) |
| 11 | 11 | ||
| 12 | execute_process( | 12 | execute_process( |
| 13 | COMMAND ${LLVM_CONFIG_EXE} --libs | 13 | COMMAND ${LLVM_CONFIG_EXE} --libs |