From 4d548131c1ac079719a26b37867a6b18ba65cee1 Mon Sep 17 00:00:00 2001 From: Julian Büning Date: Tue, 17 Nov 2020 09:59:48 +0100 Subject: fix CMake: libcxxabi is only required with KLEE_EH_CXX --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 55e3e979..cc739d65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -574,13 +574,6 @@ if (ENABLE_KLEE_LIBCXX) endif() message(STATUS "Use libc++ include path: \"${KLEE_LIBCXX_INCLUDE_DIR}\"") - set(KLEE_LIBCXXABI_SRC_DIR "" CACHE PATH "Path to libcxxabi source directory") - if (NOT EXISTS "${KLEE_LIBCXXABI_SRC_DIR}") - message(FATAL_ERROR - "${KLEE_LIBCXXABI_SRC_DIR} does not exist. Try passing -DKLEE_LIBCXXABI_SRC_DIR=") - endif() - message(STATUS "Use libc++abi source path: \"${KLEE_LIBCXXABI_SRC_DIR}\"") - # Find the library bitcode archive # Check for static first @@ -634,6 +627,13 @@ if (ENABLE_KLEE_EH_CXX) "Pass `-DENABLE_KLEE_LIBCXX=ON` to enable it.") endif() + set(KLEE_LIBCXXABI_SRC_DIR "" CACHE PATH "Path to libcxxabi source directory") + if (NOT EXISTS "${KLEE_LIBCXXABI_SRC_DIR}") + message(FATAL_ERROR + "${KLEE_LIBCXXABI_SRC_DIR} does not exist. Try passing -DKLEE_LIBCXXABI_SRC_DIR=") + endif() + message(STATUS "Use libc++abi source path: \"${KLEE_LIBCXXABI_SRC_DIR}\"") + if (${LLVM_VERSION_MAJOR} GREATER 8 OR ${LLVM_VERSION_MAJOR} EQUAL 8) set(SUPPORT_KLEE_EH_CXX 1) # For config.h message(STATUS "Support for C++ Exceptions enabled") -- cgit 1.4.1