diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2017-05-23 00:42:53 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2017-06-03 12:47:23 -0400 |
| commit | e64f0971fc788cefb348e9516cd3b284df7ea0df (patch) | |
| tree | fcd343acc56d078d753c936f57a1bfe762734563 /cmake | |
| parent | 1e301b03a9110b3cd8a29530ad9cbc85b403a902 (diff) | |
| download | zig-e64f0971fc788cefb348e9516cd3b284df7ea0df.tar.gz zig-e64f0971fc788cefb348e9516cd3b284df7ea0df.zip | |
add appveyor integration testing
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Findclang.cmake | 4 | ||||
| -rw-r--r-- | cmake/Findlld.cmake | 4 | ||||
| -rw-r--r-- | cmake/Findllvm.cmake | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/cmake/Findclang.cmake b/cmake/Findclang.cmake index e3dc7476c8..77c2b5bb12 100644 --- a/cmake/Findclang.cmake +++ b/cmake/Findclang.cmake @@ -16,7 +16,9 @@ find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} PATHS /usr/lib/llvm-4.0/lib - /mingw64/lib) + /mingw64/lib + /c/msys64/mingw64/lib + c:\\msys64\\mingw64\\lib) if(CLANG_${_prettylibname_}_LIB) set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_${_prettylibname_}_LIB}) endif() diff --git a/cmake/Findlld.cmake b/cmake/Findlld.cmake index c4bdd89628..d20ffed6f2 100644 --- a/cmake/Findlld.cmake +++ b/cmake/Findlld.cmake @@ -20,7 +20,9 @@ else() find_library(LLD_${_prettylibname_}_LIB NAMES ${_libname_} PATHS /usr/lib/llvm-4.0/lib - /mingw64/lib) + /mingw64/lib + /c/msys64/mingw64/lib + c:/msys64/mingw64/lib) if(LLD_${_prettylibname_}_LIB) set(LLD_LIBRARIES ${LLD_LIBRARIES} ${LLD_${_prettylibname_}_LIB}) endif() diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake index 02392eaef3..8459efe19c 100644 --- a/cmake/Findllvm.cmake +++ b/cmake/Findllvm.cmake @@ -10,6 +10,9 @@ find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-4.0 PATHS + "/mingw64/bin" + "/c/msys64/mingw64/bin" + "c:/msys64/mingw64/bin" "C:/Libraries/llvm-4.0.0/bin") execute_process( |