From 28317feab11f0b7d039854e1b52957d18f1983cf Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 21 Nov 2012 08:59:20 +0000 Subject: More LLVM work (now always search llvm-config into LLVM_DIRECTORY when set!). --- CMakeLists.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cc45000c62b..3ca01a8a28b 100644 --- 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 -- cgit v1.2.3