disable opencl when compo is disabled.
authorCampbell Barton <ideasman42@gmail.com>
Sat, 30 Jun 2012 14:28:45 +0000 (14:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 30 Jun 2012 14:28:45 +0000 (14:28 +0000)
source/blender/CMakeLists.txt
source/blender/opencl/CMakeLists.txt

index 3241acd7df6604fff6d4b3f025612ba3c554dd26..3c75666857874b2cbed41ac41443ac0ef674ae65 100644 (file)
@@ -99,7 +99,6 @@ add_subdirectory(blenfont)
 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(makesdna)
 add_subdirectory(makesrna)
 
 if(WITH_COMPOSITOR)
+       add_subdirectory(opencl)  # later on this may be used more generally
        add_subdirectory(compositor)
 endif()
 
index 6b645e02a6f55ea7f9f1ac683a799de8a1ef1dcb..20dcf33d3632de146db149232470d2934d295213 100644 (file)
@@ -33,10 +33,10 @@ set(INC_SYS
 )
 
 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
 )