Cycles: Support building with latest upstream OSL

Only affects standalone part.

intern/cycles/cmake/external_libs.cmake

@@ -86,6 +86,13 @@ if(CYCLES_STANDALONE_REPOSITORY)
 	# but don't make it required.
 	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)
@@ -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)
@@ -113,13 +122,6 @@ if(CYCLES_STANDALONE_REPOSITORY)
 	set(BOOST_LIBPATH ${Boost_LIBRARY_DIRS})
 	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)