[Bf-blender-cvs] [6650436] input_method_editor: CMake: disable OSL if its not found

Campbell Barton noreply at git.blender.org
Mon Nov 24 00:45:18 CET 2014


Commit: 6650436d4adcb54a1dfcdd716746dc30961651f9
Author: Campbell Barton
Date:   Fri Nov 21 13:07:18 2014 +0100
Branches: input_method_editor
https://developer.blender.org/rB6650436d4adcb54a1dfcdd716746dc30961651f9

CMake: disable OSL if its not found

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbf2e31..6d0e826 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1076,11 +1076,9 @@ if(UNIX AND NOT APPLE)
 	
 		if(OSL_INCLUDES AND OSL_LIBRARIES AND OSL_COMPILER)
 			set(OSL_FOUND TRUE)
-			message(STATUS "OSL includes = ${OSL_INCLUDES}")
-			message(STATUS "OSL library = ${OSL_LIBRARIES}")
-			message(STATUS "OSL compiler = ${OSL_COMPILER}")
 		else()
 			message(STATUS "OSL not found")
+			set(WITH_CYCLES_OSL OFF)
 		endif()
 	endif()
 
@@ -1755,6 +1753,7 @@ elseif(WIN32)
 			set(OSL_FOUND TRUE)
 		else()
 			message(STATUS "OSL not found")
+			set(WITH_CYCLES_OSL OFF)
 		endif()
 	endif()
 
@@ -2048,6 +2047,7 @@ elseif(APPLE)
 			set(OSL_FOUND TRUE)
 		else()
 			message(STATUS "OSL not found")
+			set(WITH_CYCLES_OSL OFF)
 		endif()
 	endif()




More information about the Bf-blender-cvs mailing list