From 536c35136ab98f2f56d07937727b3c99c0e35c5c Mon Sep 17 00:00:00 2001
From: Josh Wolfe <thejoshwolfe@gmail.com>
Date: Wed, 29 Mar 2017 22:18:12 -0700
Subject: [PATCH] fix cmake finding dependencies for ubuntu

---
 CMakeLists.txt        | 3 +++
 cmake/Findclang.cmake | 4 ++--
 cmake/Findlld.cmake   | 4 ++--
 cmake/Findllvm.cmake  | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb23006bdf..8f871ce7e6 100644
--- a/CMakeLists.txt
+++ b/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)
 
diff --git a/cmake/Findclang.cmake b/cmake/Findclang.cmake
index f72f10f817..e3dc7476c8 100644
--- a/cmake/Findclang.cmake
+++ b/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})
diff --git a/cmake/Findlld.cmake b/cmake/Findlld.cmake
index e74e8acf60..eeaa2fbbe3 100644
--- a/cmake/Findlld.cmake
+++ b/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})
diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake
index e1d55fb3fd..29e8f26fb7 100644
--- a/cmake/Findllvm.cmake
+++ b/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