Made a mistake in recent windows buildbot tweaks.
[blender.git] / extern / CMakeLists.txt
index 6215673eb44b39af85d50484243410412382a1f1..941f69e90473ffe573553b37ed86cfc5456badff 100644 (file)
@@ -12,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.
 remove_strict_flags()
 
 add_subdirectory(colamd)
+add_subdirectory(rangetree)
+add_subdirectory(wcwidth)
 
 if(WITH_BULLET)
-       add_subdirectory(bullet2)
+       if(NOT WITH_SYSTEM_BULLET)
+               add_subdirectory(bullet2)
+       endif()
 endif()
 
-if(WITH_MOD_CLOTH_ELTOPO)
-       add_subdirectory(eltopo)
-endif()
+# now only available in a branch
+#if(WITH_MOD_CLOTH_ELTOPO)
+#      add_subdirectory(eltopo)
+#endif()
 
 if(WITH_BINRELOC)
        add_subdirectory(binreloc)
 endif()
 
-if(WITH_BUILTIN_GLEW)
+if(NOT WITH_SYSTEM_GLEW)
        add_subdirectory(glew)
 endif()
 
@@ -48,7 +53,7 @@ if(WITH_GAMEENGINE)
        add_subdirectory(recastnavigation)
 endif()
 
-if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE))
+if(WITH_IMAGE_OPENJPEG AND (NOT WITH_SYSTEM_OPENJPEG))
        add_subdirectory(libopenjpeg)
 endif()
 
@@ -68,6 +73,12 @@ if(WITH_LIBMV)
        add_subdirectory(libmv)
 endif()
 
-if(WITH_CARVE)
+if(WITH_MOD_BOOLEAN)
        add_subdirectory(carve)
 endif()
+
+if(WITH_GHOST_XDND)
+       if(UNIX AND NOT APPLE)
+               add_subdirectory(xdnd)
+       endif()
+endif()