diff options
| author | Gil Pitney <gil.pitney@linaro.org> | 2015-01-22 23:48:29 +0000 |
|---|---|---|
| committer | Gil Pitney <gil.pitney@linaro.org> | 2015-01-22 23:48:29 +0000 |
| commit | 9ec42f77d26b7d0f06d3db98b0db4353c702141b (patch) | |
| tree | 94b77bf4eac69e0b7d6cff184baddf9bf5b31e20 | |
| parent | eaed9770913a70f23870fd92448cc8026b48a0a6 (diff) | |
LLVM 3.6: Update CMake files to build for LLVM 3.6 and newer CMAKE
Upated to look for LLVM 3.6 llvm-config.
Also made a few syntax fixes for newer CMAKE version > 2.8.
Signed-off-by: Gil Pitney <gil.pitney@linaro.org>
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cmake/modules/FindLLVM.cmake | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b272c54..c60b69c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ # -DBUILD_TESTS=ON # Note PROJECT=shamrock is default. cmake_minimum_required(VERSION 2.6) +cmake_policy(SET CMP0022 OLD) # Project Options: OPTION(BUILD_TESTS "Set to ON to build minimal OpenCL tests" ON) diff --git a/cmake/modules/FindLLVM.cmake b/cmake/modules/FindLLVM.cmake index 18a44c9..0e3e11b 100644 --- a/cmake/modules/FindLLVM.cmake +++ b/cmake/modules/FindLLVM.cmake @@ -45,7 +45,7 @@ if(IS_X86_64_HOST) endif() # Version of LLVM we are currently based off of -set(LLVM_VERSION 350) +set(LLVM_VERSION 360) if (NOT SHAMROCK_BUILD) # Set up llvm paths, using environment variables if defined @@ -98,7 +98,7 @@ exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE REPORTED_L STRING(REPLACE "." "" REPORTED_LLVM_VERSION ${REPORTED_LLVM_VERSION}) if(NOT ${REPORTED_LLVM_VERSION} STREQUAL ${LLVM_VERSION}) - message(FATAL_ERROR "ERROR!: llvm-config reports different version that what is expected \(${REPORTED_LLVM_VERSION} != ${LLVM_VERSION}"\)) + message(FATAL_ERROR "ERROR!: llvm-config reports different version that what is expected \(${REPORTED_LLVM_VERSION} != ${LLVM_VERSION}" \)) endif() # Macro to build up list of llvm libraries @@ -150,7 +150,7 @@ elseif(HAWKING_BUILD OR SHARMROCK_BUILD) set (LLVM_LIB_TARGET ARM) endif() -exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --libs ${LLVM_LIB_TARGET} asmparser native bitwriter tablegen jit mcjit debuginfo interpreter linker irreader instrumentation ipo mcdisassembler option objcarcopts profiledata OUTPUT_VARIABLE LLVM_LIBS_CORE ) +exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --libs ${LLVM_LIB_TARGET} asmparser native bitwriter tablegen mcjit debuginfo interpreter linker irreader instrumentation ipo mcdisassembler option objcarcopts profiledata OUTPUT_VARIABLE LLVM_LIBS_CORE ) MESSAGE(STATUS "LLVM core libs: " ${LLVM_LIBS_CORE}) if(LLVM_INCLUDE_DIR) |