Commit 536c35136a

Josh Wolfe <thejoshwolfe@gmail.com>
2017-03-30 07:18:12
fix cmake finding dependencies for ubuntu
master
1 parent f48f7f4
Changed files (4)
cmake
Findclang.cmake
Findlld.cmake
Findllvm.cmake
CMakeLists.txt
cmake/Findclang.cmake
@@ -8,14 +8,14 @@
 
 find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
     PATHS
-        /usr/lib/llvm-4/include
+        /usr/lib/llvm-4.0/include
         /mingw64/include)
 
     macro(FIND_AND_ADD_CLANG_LIB _libname_)
     string(TOUPPER ${_libname_} _prettylibname_)
     find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
         PATHS
-            /usr/lib/llvm-4/lib
+            /usr/lib/llvm-4.0/lib
             /mingw64/lib)
     if(CLANG_${_prettylibname_}_LIB)
         set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_${_prettylibname_}_LIB})
cmake/Findlld.cmake
@@ -8,14 +8,14 @@
 
 find_path(LLD_INCLUDE_DIRS NAMES lld/Driver/Driver.h
     PATHS
-        /usr/lib/llvm-4/include
+        /usr/lib/llvm-4.0/include
         /mingw64/include)
 
     macro(FIND_AND_ADD_LLD_LIB _libname_)
     string(TOUPPER ${_libname_} _prettylibname_)
     find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_}
         PATHS
-            /usr/lib/llvm-4/lib
+            /usr/lib/llvm-4.0/lib
             /mingw64/lib)
         if(LLD_${_prettylibname_}_LIB)
             set(LLD_LIBRARIES ${LLD_LIBRARIES} ${LLD_${_prettylibname_}_LIB})
cmake/Findllvm.cmake
@@ -7,7 +7,7 @@
 # LLVM_LIBRARIES
 # 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(
     COMMAND ${LLVM_CONFIG_EXE} --libs
CMakeLists.txt
@@ -34,6 +34,8 @@ include_directories(${CLANG_INCLUDE_DIRS})
 find_package(lld)
 include_directories(${LLD_INCLUDE_DIRS})
 
+find_package(Threads)
+
 include_directories(
     ${CMAKE_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}
@@ -196,6 +198,7 @@ target_link_libraries(zig LINK_PUBLIC
     ${CLANG_LIBRARIES}
     ${LLD_LIBRARIES}
     ${LLVM_LIBRARIES}
+    ${CMAKE_THREAD_LIBS_INIT}
 )
 install(TARGETS zig DESTINATION bin)