Prefer versioned llvm-config
authorSimon Richter <Simon.Richter@hogyros.de>
Tue, 16 Apr 2013 18:02:08 +0000 (20:02 +0200)
committerZhigang Gong <zhigang.gong@linux.intel.com>
Thu, 18 Apr 2013 03:21:20 +0000 (11:21 +0800)
If multiple versions are installed, prefer version 3.2 before falling back
to the default version.

Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com>
CMake/FindLLVM.cmake

index 6137a9c..c06b8a4 100644 (file)
@@ -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 llvm-config-32 llvm-config-3.0 DOC "llvm-config executable" PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH)
-else (LLVM_INSTALL_DIR)
-  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config llvm-config-32 llvm-config-3.0 DOC "llvm-config executable")
+  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)
+else (LLVM_INSTALL_DIR)                                                                
+  find_program(LLVM_CONFIG_EXECUTABLE NAMES llvm-config-32 llvm-config-3.2 llvm-config DOC "llvm-config executable")
 endif (LLVM_INSTALL_DIR)
 
 if (LLVM_CONFIG_EXECUTABLE)