summaryrefslogtreecommitdiff
path: root/CMake
diff options
context:
space:
mode:
authorYang Rong <rong.r.yang@intel.com>2013-05-23 13:48:47 +0800
committerZhigang Gong <zhigang.gong@linux.intel.com>2013-05-23 13:52:48 +0800
commit25bfb6ca3b22fc8f439ebd58ee03e33bfceeb927 (patch)
tree5eeb1e04cba861db23471c810c66e8bcc7e58598 /CMake
parent34ed7dbf95eae804655869828e4544366cc4b54b (diff)
downloadbeignet-25bfb6ca3b22fc8f439ebd58ee03e33bfceeb927.tar.gz
Change CMake to support LLVM 3.1.
Also fix LLVM 3.1 build errors caused by my vector scalarize commit. Signed-off-by: Yang Rong <rong.r.yang@intel.com> Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Diffstat (limited to 'CMake')
-rw-r--r--CMake/FindLLVM.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/CMake/FindLLVM.cmake b/CMake/FindLLVM.cmake
index b3206391..e76ab429 100644
--- a/CMake/FindLLVM.cmake
+++ b/CMake/FindLLVM.cmake
@@ -7,9 +7,9 @@
# LLVM_MODULE_LIBS - list of llvm libs for working with modules.
# LLVM_FOUND - True if llvm found.
if (LLVM_INSTALL_DIR)
- find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-32 llvm-config-3.2 llvm-config DOC "llvm-config executable" PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH)
+ find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-32 llvm-config-3.2 llvm-config-31 llvm-config-3.1 llvm-config DOC "llvm-config executable" PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH)
else (LLVM_INSTALL_DIR)
- find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-32 llvm-config-3.2 llvm-config DOC "llvm-config executable")
+ find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-32 llvm-config-3.2 llvm-config-31 llvm-config-3.1 llvm-config DOC "llvm-config executable")
endif (LLVM_INSTALL_DIR)
if (LLVM_CONFIG_EXECUTABLE)