[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36078] trunk/blender: eltopo cloth solver couldnt be enabled from cmake, also dont use globbing.

Campbell Barton ideasman42 at gmail.com
Sun Apr 10 07:43:35 CEST 2011


Revision: 36078
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36078
Author:   campbellbarton
Date:     2011-04-10 05:43:34 +0000 (Sun, 10 Apr 2011)
Log Message:
-----------
eltopo cloth solver couldnt be enabled from cmake, also dont use globbing.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/extern/CMakeLists.txt
    trunk/blender/extern/eltopo/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-04-10 03:34:39 UTC (rev 36077)
+++ trunk/blender/CMakeLists.txt	2011-04-10 05:43:34 UTC (rev 36078)
@@ -125,6 +125,8 @@
 option(WITH_MOD_FLUID        	"Enable Elbeem Modifier (Fluid Simulation)" ON)
 option(WITH_MOD_DECIMATE       	"Enable Decimate Modifier" ON)
 option(WITH_MOD_BOOLEAN        	"Enable Boolean Modifier" ON)
+option(WITH_MOD_CLOTH_ELTOPO   	"Enable Experemental cloth solver" ON)
+mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
 
 # Image format support
 option(WITH_IMAGE_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)

Modified: trunk/blender/extern/CMakeLists.txt
===================================================================
--- trunk/blender/extern/CMakeLists.txt	2011-04-10 03:34:39 UTC (rev 36077)
+++ trunk/blender/extern/CMakeLists.txt	2011-04-10 05:43:34 UTC (rev 36078)
@@ -31,7 +31,7 @@
 	add_subdirectory(bullet2)
 endif()
 
-if(WITH_ELTOPO)
+if(WITH_MOD_CLOTH_ELTOPO)
 	add_subdirectory(eltopo)
 endif()
 

Modified: trunk/blender/extern/eltopo/CMakeLists.txt
===================================================================
--- trunk/blender/extern/eltopo/CMakeLists.txt	2011-04-10 03:34:39 UTC (rev 36077)
+++ trunk/blender/extern/eltopo/CMakeLists.txt	2011-04-10 05:43:34 UTC (rev 36078)
@@ -20,23 +20,106 @@
 #
 # The Original Code is: all of this file.
 #
-# Contributor(s): Jacques Beaurai, Erwin Coumans
+# Contributor(s): Jacques Beaurai
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC . common common/newsparse eltopo3d common/tunicate common/meshes)
+set(INC
+	.
+	common
+	common/newsparse
+	common/tunicate
+	common/meshes
+	eltopo3d
+)
 
-FILE(GLOB SRC
-	common/*.cpp
-	common/newsparse/*.cpp
-	common/tunicate/*.cpp
-	common/sparse/*.cpp
-	eltopo3d/*.cpp
-	./*.cpp
+set(SRC
+	eltopo-capi.cpp
+	common/bfstream.cpp
+	common/ccd_wrapper.cpp
+	common/clamped_spline.cpp
+	common/collisionqueries.cpp
+	common/cubic_ccd_wrapper.cpp
+	common/fe_ccd_wrapper.cpp
+	common/fileio.cpp
+	common/gluvi.cpp
+	common/levelset.cpp
+	common/makelevelset2.cpp
+	common/makelevelset3.cpp
+	common/marching_triangles.cpp
+	common/newsparse/dense_matrix.cpp
+	common/newsparse/krylov_solvers.cpp
+	common/newsparse/sparse_matrix.cpp
+	common/predicates.cpp
+	common/sos_ccd_wrapper.cpp
+	common/sparse/incomplete_qr.cpp
+	common/tunicate/expansion.cpp
+	common/tunicate/intersection.cpp
+	common/tunicate/neg.cpp
+	common/tunicate/orientation.cpp
+	common/tunicate/sos_intersection.cpp
+	common/tunicate/sos_orientation.cpp
+	common/wallclocktime.cpp
+	eltopo3d/accelerationgrid.cpp
+	eltopo3d/broadphasegrid.cpp
+	eltopo3d/dynamicsurface.cpp
+	eltopo3d/eltopo.cpp
+	eltopo3d/nondestructivetrimesh.cpp
+	eltopo3d/subdivisionscheme.cpp
+	eltopo3d/surftrack.cpp
+
+	eltopo-capi.h
+	common/array1.h
+	common/array2.h
+	common/array3.h
+	common/array3_utils.h
+	common/bfstream.h
+	common/blas_wrapper.h
+	common/ccd_wrapper.h
+	common/clamped_spline.h
+	common/collisionqueries.h
+	common/fileio.h
+	common/gluvi.h
+	common/grid3.h
+	common/hashtable.h
+	common/lapack_wrapper.h
+	common/levelset.h
+	common/makelevelset2.h
+	common/makelevelset3.h
+	common/marching_triangles.h
+	common/mat.h
+	common/matlapack.h
+	common/newsparse/dense_matrix.h
+	common/newsparse/krylov_solvers.h
+	common/newsparse/linear_operator.h
+	common/newsparse/sparse_matrix.h
+	common/openglutils.h
+	common/predicates.h
+	common/sparse/cgsolver.h
+	common/sparse/crsolver.h
+	common/sparse/incomplete_qr.h
+	common/sparse/sparseilu.h
+	common/sparse/sparsematrix.h
+	common/sparse/sparsemilu.h
+	common/tunicate/expansion.h
+	common/tunicate/neg.h
+	common/tunicate/tunicate.h
+	common/util.h
+	common/vec.h
+	common/vector_math.h
+	common/wallclocktime.h
+	eltopo3d/accelerationgrid.h
+	eltopo3d/broadphase.h
+	eltopo3d/broadphasegrid.h
+	eltopo3d/dynamicsurface.h
+	eltopo3d/eltopo.h
+	eltopo3d/nondestructivetrimesh.h
+	eltopo3d/options.h
+	eltopo3d/subdivisionscheme.h
+	eltopo3d/surftrack.h
 )
 
-ADD_DEFINITIONS(-DNOGUI)
-ADD_DEFINITIONS(-DUSE_FORTRAN_BLAS)
+add_definitions(-DNOGUI)
+add_definitions(-DUSE_FORTRAN_BLAS)
 
 blender_add_lib(extern_eltopo "${SRC}" "${INC}")
-




More information about the Bf-blender-cvs mailing list