From fc185a9812ac965209ed7cbeb6651936e654073b Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 22 Oct 2020 21:29:07 +0100 Subject: [PATCH] Disable z3 to avoid pulling ocaml into main. For some reason the cmake option LLVM_ENABLE_Z3_SOLVER was not taken into account Last-Update: 2019-11-26 Gbp-Pq: Name no-z3.patch --- llvm/CMakeLists.txt | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 0e85afa82..63511c0e8 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -351,24 +351,22 @@ option(LLVM_ENABLE_ZLIB "Use zlib for compression/decompression if available." O set(LLVM_Z3_INSTALL_DIR "" CACHE STRING "Install directory of the Z3 solver.") -find_package(Z3 4.7.1) - -if (LLVM_Z3_INSTALL_DIR) - if (NOT Z3_FOUND) - message(FATAL_ERROR "Z3 >= 4.7.1 has not been found in LLVM_Z3_INSTALL_DIR: ${LLVM_Z3_INSTALL_DIR}.") - endif() -endif() - -set(LLVM_ENABLE_Z3_SOLVER_DEFAULT "${Z3_FOUND}") - option(LLVM_ENABLE_Z3_SOLVER "Enable Support for the Z3 constraint solver in LLVM." - ${LLVM_ENABLE_Z3_SOLVER_DEFAULT} + ON ) if (LLVM_ENABLE_Z3_SOLVER) - if (NOT Z3_FOUND) - message(FATAL_ERROR "LLVM_ENABLE_Z3_SOLVER cannot be enabled when Z3 is not available.") + find_package(Z3 4.7.1) + + if (LLVM_Z3_INSTALL_DIR) + if (NOT Z3_FOUND) + message(FATAL_ERROR "Z3 >= 4.7.1 has not been found in LLVM_Z3_INSTALL_DIR: ${LLVM_Z3_INSTALL_DIR}.") + endif() + else() + if (NOT Z3_FOUND) + message(FATAL_ERROR "LLVM_ENABLE_Z3_SOLVER cannot be enabled when Z3 is not available.") + endif() endif() set(LLVM_WITH_Z3 1) -- 2.30.2