diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-03-05 07:33:57 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-03-05 07:42:01 +0300 |
| commit | acfc0d4a18197af345581a61d4c6c6b352151205 (patch) | |
| tree | 1dfed9faf348ae915fdb2dbe57af3610a6fcc4a4 /CMakeLists.txt | |
| parent | 30d6589069ccf993ca22e3a8ed2226d9396734f0 (diff) | |
CMake: was defaulting to an old LLVM version
Made finding LLVM fail.
only use LLVM_VERSION if set, else set to installed version
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0809a2f1ba9..6a7e39cadf6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1033,18 +1033,18 @@ if(UNIX AND NOT APPLE) # XXX Maybe most of this section should go into an llvm module? if(WITH_LLVM) - # Set llvm version if not specified - if(NOT LLVM_VERSION) - set(LLVM_VERSION "3.0") - endif() if(LLVM_DIRECTORY) - find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH) + if(NOT DEFINED LLVM_VERSION) + find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH) + endif() 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 DEFINED LLVM_VERSION) + find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION}) + endif() if(NOT LLVM_CONFIG) find_program(LLVM_CONFIG llvm-config) endif() |