svn merge ^/trunk/blender -r47058:47067
[blender.git] / intern / CMakeLists.txt
index ac08b780ab8efd5cb116a2820f1eda82c9b672bb..71d2ef5e410f45f79533ef017b55353b943d2782 100644 (file)
@@ -1,4 +1,3 @@
-# $Id$
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -13,7 +12,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # The Original Code is Copyright (C) 2006, Blender Foundation
 # All rights reserved.
 #
 # ***** END GPL LICENSE BLOCK *****
 
-ADD_SUBDIRECTORY(audaspace)
-ADD_SUBDIRECTORY(string)
-ADD_SUBDIRECTORY(ghost)
-ADD_SUBDIRECTORY(guardedalloc)
-ADD_SUBDIRECTORY(moto)
-ADD_SUBDIRECTORY(container)
-ADD_SUBDIRECTORY(memutil)
-ADD_SUBDIRECTORY(decimation)
-ADD_SUBDIRECTORY(iksolver)
-ADD_SUBDIRECTORY(itasc)
-ADD_SUBDIRECTORY(boolop)
-ADD_SUBDIRECTORY(opennl)
-ADD_SUBDIRECTORY(smoke)
-
-IF(WITH_ELBEEM)
-       ADD_SUBDIRECTORY(elbeem)
-ENDIF(WITH_ELBEEM)
-
-ADD_SUBDIRECTORY(bsp)
+add_subdirectory(string)
+add_subdirectory(ghost)
+add_subdirectory(guardedalloc)
+add_subdirectory(moto)
+add_subdirectory(memutil)
+add_subdirectory(iksolver)
+add_subdirectory(opennl)
+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)
+endif()
+
+if(WITH_MOD_BOOLEAN)
+       add_subdirectory(boolop)
+       add_subdirectory(bsp)
+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()