diff --git a/CMakeLists.txt b/CMakeLists.txt index 781076ef61..51e2f7d77d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,9 +137,9 @@ else() set(ZIG_SYSTEM_LIBCXX "stdc++" CACHE STRING "system libcxx name for build.zig") endif() -find_package(llvm 18) -find_package(clang 18) -find_package(lld 18) +find_package(llvm 19) +find_package(clang 19) +find_package(lld 19) if(ZIG_STATIC_ZLIB) if (MSVC) diff --git a/cmake/Findclang.cmake b/cmake/Findclang.cmake index c21fe18837..6dbe13eccd 100644 --- a/cmake/Findclang.cmake +++ b/cmake/Findclang.cmake @@ -17,10 +17,10 @@ find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h if(${LLVM_LINK_MODE} STREQUAL "shared") find_library(CLANG_LIBRARIES NAMES - libclang-cpp.so.18 - libclang-cpp.so.18.1 - clang-cpp-18.0 - clang-cpp180 + libclang-cpp.so.19 + libclang-cpp.so.19.1 + clang-cpp-19.0 + clang-cpp190 clang-cpp NAMES_PER_DIR HINTS "${LLVM_LIBDIRS}" @@ -68,6 +68,7 @@ else() FIND_AND_ADD_CLANG_LIB(clangToolingCore) FIND_AND_ADD_CLANG_LIB(clangExtractAPI) FIND_AND_ADD_CLANG_LIB(clangSupport) + FIND_AND_ADD_CLANG_LIB(clangInstallAPI) endif() if (MSVC) diff --git a/cmake/Findlld.cmake b/cmake/Findlld.cmake index abe29b5fce..7c86aaed07 100644 --- a/cmake/Findlld.cmake +++ b/cmake/Findlld.cmake @@ -9,21 +9,21 @@ find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h HINTS ${LLVM_INCLUDE_DIRS} PATHS - /usr/lib/llvm-18/include - /usr/local/llvm180/include - /usr/local/llvm18/include - /usr/local/opt/llvm@18/include - /opt/homebrew/opt/llvm@18/include + /usr/lib/llvm-19/include + /usr/local/llvm190/include + /usr/local/llvm19/include + /usr/local/opt/llvm@19/include + /opt/homebrew/opt/llvm@19/include /mingw64/include) -find_library(LLD_LIBRARY NAMES lld-18.0 lld180 lld NAMES_PER_DIR +find_library(LLD_LIBRARY NAMES lld-19.0 lld190 lld NAMES_PER_DIR HINTS ${LLVM_LIBDIRS} PATHS - /usr/lib/llvm-18/lib - /usr/local/llvm180/lib - /usr/local/llvm18/lib - /usr/local/opt/llvm@18/lib - /opt/homebrew/opt/llvm@18/lib + /usr/lib/llvm-19/lib + /usr/local/llvm190/lib + /usr/local/llvm19/lib + /usr/local/opt/llvm@19/lib + /opt/homebrew/opt/llvm@19/lib ) if(EXISTS ${LLD_LIBRARY}) set(LLD_LIBRARIES ${LLD_LIBRARY}) @@ -34,11 +34,11 @@ else() HINTS ${LLVM_LIBDIRS} PATHS ${LLD_LIBDIRS} - /usr/lib/llvm-18/lib - /usr/local/llvm180/lib - /usr/local/llvm18/lib - /usr/local/opt/llvm@18/lib - /opt/homebrew/opt/llvm@18/lib + /usr/lib/llvm-19/lib + /usr/local/llvm190/lib + /usr/local/llvm19/lib + /usr/local/opt/llvm@19/lib + /opt/homebrew/opt/llvm@19/lib /mingw64/lib /c/msys64/mingw64/lib c:/msys64/mingw64/lib) diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake index c4eb49fe76..16a429fd28 100644 --- a/cmake/Findllvm.cmake +++ b/cmake/Findllvm.cmake @@ -17,12 +17,12 @@ if(ZIG_USE_LLVM_CONFIG) # terminate when the right LLVM version is not found. unset(LLVM_CONFIG_EXE CACHE) find_program(LLVM_CONFIG_EXE - NAMES llvm-config-18 llvm-config-18.0 llvm-config180 llvm-config18 llvm-config NAMES_PER_DIR + NAMES llvm-config-19 llvm-config-19.0 llvm-config190 llvm-config19 llvm-config NAMES_PER_DIR PATHS "/mingw64/bin" "/c/msys64/mingw64/bin" "c:/msys64/mingw64/bin" - "C:/Libraries/llvm-18.0.0/bin") + "C:/Libraries/llvm-19.0.0/bin") if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND") if (NOT LLVM_CONFIG_ERROR_MESSAGES STREQUAL "") @@ -40,9 +40,9 @@ if(ZIG_USE_LLVM_CONFIG) OUTPUT_STRIP_TRAILING_WHITESPACE) get_filename_component(LLVM_CONFIG_DIR "${LLVM_CONFIG_EXE}" DIRECTORY) - if("${LLVM_CONFIG_VERSION}" VERSION_LESS 18 OR "${LLVM_CONFIG_VERSION}" VERSION_EQUAL 19 OR "${LLVM_CONFIG_VERSION}" VERSION_GREATER 19) + if("${LLVM_CONFIG_VERSION}" VERSION_LESS 19 OR "${LLVM_CONFIG_VERSION}" VERSION_EQUAL 20 OR "${LLVM_CONFIG_VERSION}" VERSION_GREATER 20) # Save the error message, in case this is the last llvm-config we find - list(APPEND LLVM_CONFIG_ERROR_MESSAGES "expected LLVM 18.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}") + list(APPEND LLVM_CONFIG_ERROR_MESSAGES "expected LLVM 19.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}") # Ignore this directory and try the search again list(APPEND CMAKE_IGNORE_PATH "${LLVM_CONFIG_DIR}") @@ -63,12 +63,12 @@ if(ZIG_USE_LLVM_CONFIG) ERROR_VARIABLE LLVM_CONFIG_ERROR ERROR_STRIP_TRAILING_WHITESPACE) - if (LLVM_CONFIG_ERROR) + if (LLVM_CONFIG_ERROR) # Save the error message, in case this is the last llvm-config we find if (ZIG_SHARED_LLVM) - list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 18.x found at ${LLVM_CONFIG_EXE} does not support linking as a shared library") + list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 19.x found at ${LLVM_CONFIG_EXE} does not support linking as a shared library") else() - list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 18.x found at ${LLVM_CONFIG_EXE} does not support linking as a static library") + list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 19.x found at ${LLVM_CONFIG_EXE} does not support linking as a static library") endif() # Ignore this directory and try the search again