[Bf-blender-cvs] [2cdfa3e] master: Cycles: Support building with latest upstream OSL

[Sergey Sharybin]

Commit: 2cdfa3ea5bbe73cc5595e0434c128819331654b6
Author: Sergey Sharybin
Date:   Sat Sep 5 17:33:59 2015 +0500
Branches: master
https://developer.blender.org/rB2cdfa3ea5bbe73cc5595e0434c128819331654b6

Cycles: Support building with latest upstream OSL

Only affects standalone part.

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

M	intern/cycles/cmake/external_libs.cmake

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

diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake
index d7c59f4..10a166b 100644
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
@@ -87,6 +87,13 @@ if(CYCLES_STANDALONE_REPOSITORY)
 	find_package(OpenEXR)
 
 	####
+	# OpenShadingLanguage
+	if(WITH_CYCLES_OSL)
+		find_package(OpenShadingLanguage REQUIRED)
+		find_package(LLVM REQUIRED)
+	endif()
+
+	####
 	# Boost
 	set(__boost_packages filesystem regex system thread date_time)
 	if(WITH_CYCLES_NETWORK)
@@ -97,6 +104,8 @@ if(CYCLES_STANDALONE_REPOSITORY)
 		# libraries works, could be different for someone's else libs..
 		if(APPLE OR MSVC)
 			list(APPEND __boost_packages wave)
+		elseif(NOT (${OSL_LIBRARY_VERSION_MAJOR} EQUAL "1" AND ${OSL_LIBRARY_VERSION_MINOR} LESS "6"))
+			list(APPEND __boost_packages wave)
 		endif()
 	endif()
 	find_package(Boost 1.48 COMPONENTS ${__boost_packages} REQUIRED)
@@ -114,13 +123,6 @@ if(CYCLES_STANDALONE_REPOSITORY)
 	set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
 
 	####
-	# OpenShadingLanguage
-	if(WITH_CYCLES_OSL)
-		find_package(OpenShadingLanguage REQUIRED)
-		find_package(LLVM REQUIRED)
-	endif()
-
-	####
 	# Logging
 	if(WITH_CYCLES_LOGGING)
 		find_package(Glog REQUIRED)