[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48469] trunk/blender/CMakeLists.txt: don' t disable cycles when OIIO isnt found, instead throw an error, annoying when full build is done and later find cycles isn't on.

[Campbell Barton]

Revision: 48469
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48469
Author:   campbellbarton
Date:     2012-07-01 15:26:25 +0000 (Sun, 01 Jul 2012)
Log Message:
-----------
don't disable cycles when OIIO isnt found, instead throw an error, annoying when full build is done and later find cycles isn't on.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-07-01 14:54:05 UTC (rev 48468)
+++ trunk/blender/CMakeLists.txt	2012-07-01 15:26:25 UTC (rev 48469)
@@ -667,7 +667,6 @@
 
 		if(NOT OPENIMAGEIO_FOUND)
 			set(WITH_OPENIMAGEIO OFF)
-			set(WITH_CYCLES OFF)
 			message(STATUS "OpenImageIO not found, disabling WITH_CYCLES")
 		endif()
 	endif()
@@ -1458,6 +1457,16 @@
 	endif()
 endif()
 
+if(WITH_CYCLES)
+	if(NOT WITH_OPENIMAGEIO)
+		message(FATAL_ERROR "Cycles reqires WITH_OPENIMAGEIO, the library may not have been found. Configure OIIO or disable WITH_CYCLES")
+	endif()
+	if(NOT WITH_BOOST)
+		message(FATAL_ERROR "Cycles reqires WITH_BOOST, the library may not have been found. Configure BOOST or disable WITH_CYCLES")
+	endif()
+endif()
+
+
 # See TEST_SSE_SUPPORT() for how this is defined.
 
 if(WITH_RAYOPTIMIZATION)