From 1a2dad0b6ab819fb28e67267afcc277aec510b61 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan <eocallaghan@alterapraxis.com> Date: Tue, 16 Sep 2014 03:33:59 +1000 Subject: [PATCH] Support LLVM 3.5 LLVM 3.5 headers use C+11 and so CMake will not find them even though they exist without passing -std=c++11 to its tests. Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> --- conf/FindLLVM.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/FindLLVM.cmake b/conf/FindLLVM.cmake index c94d7d4..dbe9ec9 100644 --- a/conf/FindLLVM.cmake +++ b/conf/FindLLVM.cmake @@ -150,6 +150,7 @@ else (LLVM_INCLUDE_DIR) exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --libdir OUTPUT_VARIABLE LLVM_LIB_DIR ) #MESSAGE(STATUS "LLVM lib dir: " ${LLVM_LIB_DIR}) exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIR ) + #MESSAGE(STATUS "LLVM include dir: " ${LLVM_INCLUDE_DIR}) INCLUDE(CheckIncludeFileCXX) set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR}) @@ -161,7 +162,7 @@ else (LLVM_INCLUDE_DIR) ENDIF(HAVE_SUPPORT_TARGETSELECT_H) set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR}) - set(CMAKE_REQUIRED_DEFINITIONS -D__STDC_LIMIT_MACROS=1 -D__STDC_CONSTANT_MACROS=1) + set(CMAKE_REQUIRED_DEFINITIONS -D__STDC_LIMIT_MACROS=1 -D__STDC_CONSTANT_MACROS=1 -std=c++11) check_include_file_cxx("llvm/IRBuilder.h" HAVE_IRBUILDER_H) unset(CMAKE_REQUIRED_INCLUDES) MESSAGE(STATUS "HAVE_IRBUILDER_H: " ${HAVE_IRBUILDER_H})