diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Findclang.cmake | 2 | ||||
| -rw-r--r-- | cmake/Findlld.cmake | 11 | ||||
| -rw-r--r-- | cmake/Findllvm.cmake | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/cmake/Findclang.cmake b/cmake/Findclang.cmake index ea1bc91d7b..9268f19730 100644 --- a/cmake/Findclang.cmake +++ b/cmake/Findclang.cmake @@ -30,6 +30,7 @@ else() /usr/lib/llvm/7/include /usr/lib/llvm-7/include /usr/lib/llvm-7.0/include + /usr/local/llvm70/include /mingw64/include) macro(FIND_AND_ADD_CLANG_LIB _libname_) @@ -40,6 +41,7 @@ else() /usr/lib/llvm/7/lib /usr/lib/llvm-7/lib /usr/lib/llvm-7.0/lib + /usr/local/llvm70/lib /mingw64/lib /c/msys64/mingw64/lib c:\\msys64\\mingw64\\lib) diff --git a/cmake/Findlld.cmake b/cmake/Findlld.cmake index 1c4e9163a3..93ed1a9de1 100644 --- a/cmake/Findlld.cmake +++ b/cmake/Findlld.cmake @@ -8,10 +8,14 @@ find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h PATHS - /usr/lib/llvm-6.0/include + /usr/lib/llvm-7.0/include + /usr/local/llvm70/include /mingw64/include) -find_library(LLD_LIBRARY NAMES lld-6.0 lld PATHS /usr/lib/llvm-6.0/lib) +find_library(LLD_LIBRARY NAMES lld-7.0 lld70 lld + PATHS + /usr/lib/llvm-7.0/lib + /usr/local/llvm70/lib) if(EXISTS ${LLD_LIBRARY}) set(LLD_LIBRARIES ${LLD_LIBRARY}) else() @@ -19,7 +23,8 @@ else() string(TOUPPER ${_libname_} _prettylibname_) find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_} PATHS - /usr/lib/llvm-6.0/lib + /usr/lib/llvm-7.0/lib + /usr/local/llvm70/lib /mingw64/lib /c/msys64/mingw64/lib c:/msys64/mingw64/lib) diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake index 150f2a2528..b847813682 100644 --- a/cmake/Findllvm.cmake +++ b/cmake/Findllvm.cmake @@ -8,7 +8,7 @@ # LLVM_LIBDIRS find_program(LLVM_CONFIG_EXE - NAMES llvm-config-7 llvm-config-7.0 llvm-config + NAMES llvm-config-7 llvm-config-7.0 llvm-config70 llvm-config PATHS "/mingw64/bin" "/c/msys64/mingw64/bin" |