[Bf-blender-cvs] [acfc0d4] master: CMake: was defaulting to an old LLVM version

[Campbell Barton]

Commit: acfc0d4a18197af345581a61d4c6c6b352151205
Author: Campbell Barton
Date:   Thu Mar 5 15:33:57 2015 +1100
Branches: master
https://developer.blender.org/rBacfc0d4a18197af345581a61d4c6c6b352151205

CMake: was defaulting to an old LLVM version

Made finding LLVM fail.

only use LLVM_VERSION if set, else set to installed version

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0809a2f..6a7e39c 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()