From 71c1437ac27d6df7f57b31974efb6fe46ac8a16e Mon Sep 17 00:00:00 2001 From: David Chisnall Date: Mon, 23 Mar 2015 14:09:15 +0000 Subject: [PATCH] If we find LLVM, but fail to find the relevant cmake modules, give a helpful error and then continue without building the optimisations, instead of just dying. --- opts/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/opts/CMakeLists.txt b/opts/CMakeLists.txt index aa3f794..5140443 100644 --- a/opts/CMakeLists.txt +++ b/opts/CMakeLists.txt @@ -1,7 +1,12 @@ cmake_minimum_required(VERSION 2.8) find_package(LLVM) -include(AddLLVM) +include(AddLLVM OPTIONAL RESULT_VARIABLE INCLUDED_LLVM) + +if (${INCLUDED_LLVM} STREQUAL "NOTFOUND") + message(WARNING "Failed to include AddLLVM CMake module") +else() +message("Included: '${INCLUDED_LLVM}'") add_definitions(${LLVM_DEFINITIONS}) include_directories(${LLVM_INCLUDE_DIRS}) @@ -39,3 +44,4 @@ string(REGEX REPLACE "([0-9]*).([0-9]*).*" "-DLLVM_MAJOR=\\1 -DLLVM_MINOR=\\2" L set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LLVM_VERSION} -fno-rtti") include_directories( ${LLVM_INCLUDE_DIRS} "${LLVM_SRC}/include/" "${LLVM_OBJ}/include/") +endif() # AddLLVM include failed