From b361cc8b5104bfdc771603a59a2499e0fbac3adc Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Sun, 7 Dec 2014 10:49:45 +0000 Subject: [PATCH] Adds LLVM version check to cmake. We require LLVM 3.4 minimum, so if the user has something older make sure to not attempt compiling. Fixes issues #7858 and #7906. --- CMakeTests/FindLLVM.cmake | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeTests/FindLLVM.cmake b/CMakeTests/FindLLVM.cmake index 89975abbe5..7fe664f6ef 100644 --- a/CMakeTests/FindLLVM.cmake +++ b/CMakeTests/FindLLVM.cmake @@ -8,16 +8,16 @@ list(APPEND LLVM_CONFIG_EXECUTABLES "llvm-config-3.4") foreach(LLVM_CONFIG_NAME ${LLVM_CONFIG_EXECUTABLES}) find_program(LLVM_CONFIG_EXE NAMES ${LLVM_CONFIG_NAME}) if (LLVM_CONFIG_EXE) - set(LLVM_FOUND 1) - execute_process(COMMAND ${LLVM_CONFIG_EXE} --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIRS - OUTPUT_STRIP_TRAILING_WHITESPACE ) - execute_process(COMMAND ${LLVM_CONFIG_EXE} --ldflags OUTPUT_VARIABLE LLVM_LDFLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE ) - #execute_process(COMMAND ${LLVM_CONFIG_EXE} --libfiles Core OUTPUT_VARIABLE LLVM_LIBRARIES - # OUTPUT_STRIP_TRAILING_WHITESPACE ) execute_process(COMMAND ${LLVM_CONFIG_EXE} --version OUTPUT_VARIABLE LLVM_PACKAGE_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) - set(LLVM_LIBRARIES "${LLVM_LDFLAGS} -lLLVM-${LLVM_PACKAGE_VERSION}") - break() + if (${LLVM_PACKAGE_VERSION} VERSION_GREATER "3.3") + set(LLVM_FOUND 1) + execute_process(COMMAND ${LLVM_CONFIG_EXE} --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIRS + OUTPUT_STRIP_TRAILING_WHITESPACE ) + execute_process(COMMAND ${LLVM_CONFIG_EXE} --ldflags OUTPUT_VARIABLE LLVM_LDFLAGS + OUTPUT_STRIP_TRAILING_WHITESPACE ) + set(LLVM_LIBRARIES "${LLVM_LDFLAGS} -lLLVM-${LLVM_PACKAGE_VERSION}") + break() + endif() endif() endforeach()