diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-03-22 15:32:47 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-03-22 15:39:50 -0400 |
| commit | 62668e3e6b3c07d4145a7de3ebb9d5fdd728d75e (patch) | |
| tree | 76a96a436af0ed36195f85fcad8e05d31d92440c /cmake | |
| parent | 53588f4f124bb713cc2c67c721d5f4e3586b7d79 (diff) | |
| download | zig-62668e3e6b3c07d4145a7de3ebb9d5fdd728d75e.tar.gz zig-62668e3e6b3c07d4145a7de3ebb9d5fdd728d75e.zip | |
update to llvm 7.0.0
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Findclang.cmake | 8 | ||||
| -rw-r--r-- | cmake/Findllvm.cmake | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cmake/Findclang.cmake b/cmake/Findclang.cmake index b42abd10a3..c2845da62f 100644 --- a/cmake/Findclang.cmake +++ b/cmake/Findclang.cmake @@ -27,8 +27,8 @@ if(MSVC) else() find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h PATHS - /usr/lib/llvm/6/include - /usr/lib/llvm-6.0/include + /usr/lib/llvm/7/include + /usr/lib/llvm-7.0/include /mingw64/include) macro(FIND_AND_ADD_CLANG_LIB _libname_) @@ -36,8 +36,8 @@ else() find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} PATHS ${CLANG_LIBDIRS} - /usr/lib/llvm/6/lib - /usr/lib/llvm-6.0/lib + /usr/lib/llvm/7/lib + /usr/lib/llvm-7.0/lib /mingw64/lib /c/msys64/mingw64/lib c:\\msys64\\mingw64\\lib) diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake index 296e0a91f7..1e09ad673a 100644 --- a/cmake/Findllvm.cmake +++ b/cmake/Findllvm.cmake @@ -8,12 +8,12 @@ # LLVM_LIBDIRS find_program(LLVM_CONFIG_EXE - NAMES llvm-config-6.0 llvm-config + NAMES llvm-config-7.0 llvm-config PATHS "/mingw64/bin" "/c/msys64/mingw64/bin" "c:/msys64/mingw64/bin" - "C:/Libraries/llvm-6.0.0/bin") + "C:/Libraries/llvm-7.0.0/bin") if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug")) execute_process( @@ -62,7 +62,7 @@ execute_process( set(LLVM_LIBRARIES ${LLVM_LIBRARIES} ${LLVM_SYSTEM_LIBS}) if(NOT LLVM_LIBRARIES) - find_library(LLVM_LIBRARIES NAMES LLVM LLVM-6.0 LLVM-6) + find_library(LLVM_LIBRARIES NAMES LLVM LLVM-7.0 LLVM-7) endif() link_directories("${CMAKE_PREFIX_PATH}/lib") |