svn merge ^/trunk/blender -r47058:47067
[blender.git] / intern / CMakeLists.txt
index 3eed1ef54d2dafef14da766602b0c0eba27e0d0f..71d2ef5e410f45f79533ef017b55353b943d2782 100644 (file)
@@ -1,4 +1,3 @@
-# $Id$
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -24,7 +23,6 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-add_subdirectory(audaspace)
 add_subdirectory(string)
 add_subdirectory(ghost)
 add_subdirectory(guardedalloc)
@@ -32,12 +30,25 @@ add_subdirectory(moto)
 add_subdirectory(memutil)
 add_subdirectory(iksolver)
 add_subdirectory(opennl)
-add_subdirectory(smoke)
+add_subdirectory(mikktspace)
+add_subdirectory(raskter)
+
+if(WITH_AUDASPACE)
+       add_subdirectory(audaspace)
+endif()
+
+if(WITH_MOD_REMESH)
+       add_subdirectory(dualcon)
+endif()
 
 if(WITH_MOD_FLUID)
        add_subdirectory(elbeem)
 endif()
 
+if(WITH_MOD_SMOKE)
+       add_subdirectory(smoke)
+endif()
+
 if(WITH_MOD_DECIMATE)
        add_subdirectory(container)
        add_subdirectory(decimation)
@@ -51,3 +62,12 @@ endif()
 if(WITH_IK_ITASC)
        add_subdirectory(itasc)
 endif()
+
+if(WITH_CYCLES)
+       add_subdirectory(cycles)
+endif()
+
+# only windows needs utf16 converter
+if(WIN32)
+       add_subdirectory(utfconv)
+endif()