diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2012-11-21 12:59:20 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2012-11-21 12:59:20 +0400 |
| commit | 28317feab11f0b7d039854e1b52957d18f1983cf (patch) | |
| tree | c46a041587feebd9df823f75858d3cc3f65232af /CMakeLists.txt | |
| parent | 3370e3ca4351b24382cdc522962d51d810a1900e (diff) | |
More LLVM work (now always search llvm-config into LLVM_DIRECTORY when
set!).
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files 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 |