[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48445] trunk/blender/source/blender: disable opencl when compo is disabled.

[Campbell Barton]

Revision: 48445
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48445
Author:   campbellbarton
Date:     2012-06-30 14:28:45 +0000 (Sat, 30 Jun 2012)
Log Message:
-----------
disable opencl when compo is disabled.

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

Modified: trunk/blender/source/blender/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/CMakeLists.txt	2012-06-30 14:14:22 UTC (rev 48444)
+++ trunk/blender/source/blender/CMakeLists.txt	2012-06-30 14:28:45 UTC (rev 48445)
@@ -99,7 +99,6 @@
 add_subdirectory(blenloader)
 add_subdirectory(ikplugin)
 add_subdirectory(gpu)
-add_subdirectory(opencl)
 add_subdirectory(imbuf)
 add_subdirectory(avi)
 add_subdirectory(nodes)
@@ -108,6 +107,7 @@
 add_subdirectory(makesrna)
 
 if(WITH_COMPOSITOR)
+	add_subdirectory(opencl)  # later on this may be used more generally
 	add_subdirectory(compositor)
 endif()
 

Modified: trunk/blender/source/blender/opencl/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/opencl/CMakeLists.txt	2012-06-30 14:14:22 UTC (rev 48444)
+++ trunk/blender/source/blender/opencl/CMakeLists.txt	2012-06-30 14:28:45 UTC (rev 48445)
@@ -33,10 +33,10 @@
 )
 
 set(SRC
-    OCL_opencl.h
-    intern/clew.h
-    intern/clew.c
-    intern/OCL_opencl.c
+	OCL_opencl.h
+	intern/clew.h
+	intern/clew.c
+	intern/OCL_opencl.c
 )