More LLVM work (now always search llvm-config into LLVM_DIRECTORY when

set!).

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc45000c62bf87dd89e12091b212804f5191bfc3..3ca01a8a28b400271aef4335ddb3842d3e7a1972 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -716,9 +716,16 @@ if(UNIX AND NOT APPLE)
                        set(LLVM_VERSION "3.0")
                endif()
                set(LLVM_STATIC YES)
-               FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_DIRECTORY} ${LLVM_DIRECTORY}/bin)
-               if(NOT LLVM_CONFIG)
-                       FIND_PROGRAM(LLVM_CONFIG llvm-config HINTS ${LLVM_DIRECTORY} ${LLVM_DIRECTORY}/bin)
+               if(LLVM_DIRECTORY)
+                       FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
+                       if(NOT LLVM_CONFIG)
+                               FIND_PROGRAM(LLVM_CONFIG llvm-config HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
+                       endif()
+               else()
+                       FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION})
+                       if(NOT LLVM_CONFIG)
+                               FIND_PROGRAM(LLVM_CONFIG llvm-config)
+                       endif()
                endif()
                execute_process(COMMAND ${LLVM_CONFIG} --version
                                OUTPUT_VARIABLE LLVM_VERSION