[Bf-blender-cvs] [62e9435] master: CMake: disable OSL if its not found

[Campbell Barton]

Commit: 62e9435dbc890de30181d4b20d190a656e96fd0b
Author: Campbell Barton
Date:   Fri Nov 21 13:07:18 2014 +0100
Branches: master
https://developer.blender.org/rB62e9435dbc890de30181d4b20d190a656e96fd0b

CMake: disable OSL if its not found

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9f1d96..5120cc4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1073,11 +1073,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()
 
@@ -1752,6 +1750,7 @@ elseif(WIN32)
 			set(OSL_FOUND TRUE)
 		else()
 			message(STATUS "OSL not found")
+			set(WITH_CYCLES_OSL OFF)
 		endif()
 	endif()
 
@@ -2045,6 +2044,7 @@ elseif(APPLE)
 			set(OSL_FOUND TRUE)
 		else()
 			message(STATUS "OSL not found")
+			set(WITH_CYCLES_OSL OFF)
 		endif()
 	endif()