Use LLVM_ROOT following CMP0074

maleadt · Oct 23, 2023 · 8527661 · 8527661
1 parent 274fd42
commit 8527661
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/deps/LLVMExtra/CMakeLists.txt b/deps/LLVMExtra/CMakeLists.txt
@@ -2,6 +2,7 @@
 cmake_minimum_required(VERSION 3.3)
 
 SET(CMAKE_CXX_FLAGS "-Wall -fPIC -fno-rtti")
+cmake_policy(SET CMP0074 NEW)
 
 project(LLVMExtra
 VERSION
@@ -14,7 +15,8 @@ LANGUAGES
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(LLVM REQUIRED)
+
+find_package(LLVM REQUIRED CONFIG)
 set(CMAKE_MODULE_PATH
   ${CMAKE_MODULE_PATH}
   ${LLVM_CMAKE_DIR}

diff --git a/deps/build_local.jl b/deps/build_local.jl
@@ -48,7 +48,7 @@ LLVM_DIR = joinpath(LLVM.artifact_dir, "lib", "cmake", "llvm")
 # build and install
 @info "Building" source_dir scratch_dir build_dir LLVM_DIR
 cmake() do cmake_path
-    config_opts = `-DLLVM_DIR=$(LLVM_DIR) -DCMAKE_INSTALL_PREFIX=$(scratch_dir)`
+    config_opts = `-DLLVM_ROOT=$(LLVM_DIR) -DCMAKE_INSTALL_PREFIX=$(scratch_dir)`
     if Sys.iswindows()
         # prevent picking up MSVC
         config_opts = `$config_opts -G "MSYS Makefiles"`