[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32661] trunk/blender: use explicit file paths for CMake rather then globing, This is recommended by cmake devs.
Campbell Barton
ideasman42 at gmail.com
Sat Oct 23 06:05:56 CEST 2010
Revision: 32661
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32661
Author: campbellbarton
Date: 2010-10-23 06:05:55 +0200 (Sat, 23 Oct 2010)
Log Message:
-----------
use explicit file paths for CMake rather then globing, This is recommended by cmake devs.
globbing vs explicit is discussed here.
http://www.cmake.org/pipermail/cmake/2008-December/025694.html
Practical implications are:
- developers need to keep CMakeLists.txt files up to date.
- Users wont get strange linking errors if they build after a file is added, since CMake detects CMakeLists.txt is modified and automatically reconfigure.
Modified Paths:
--------------
trunk/blender/extern/bullet2/CMakeLists.txt
trunk/blender/extern/libopenjpeg/CMakeLists.txt
trunk/blender/extern/lzma/CMakeLists.txt
trunk/blender/extern/lzo/CMakeLists.txt
trunk/blender/intern/audaspace/CMakeLists.txt
trunk/blender/intern/boolop/CMakeLists.txt
trunk/blender/intern/bsp/CMakeLists.txt
trunk/blender/intern/container/CMakeLists.txt
trunk/blender/intern/decimation/CMakeLists.txt
trunk/blender/intern/elbeem/CMakeLists.txt
trunk/blender/intern/iksolver/CMakeLists.txt
trunk/blender/intern/itasc/CMakeLists.txt
trunk/blender/intern/memutil/CMakeLists.txt
trunk/blender/intern/moto/CMakeLists.txt
trunk/blender/intern/opennl/CMakeLists.txt
trunk/blender/intern/smoke/CMakeLists.txt
trunk/blender/intern/string/CMakeLists.txt
trunk/blender/source/blender/avi/CMakeLists.txt
trunk/blender/source/blender/blenfont/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenlib/CMakeLists.txt
trunk/blender/source/blender/blenloader/CMakeLists.txt
trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
trunk/blender/source/blender/collada/CMakeLists.txt
trunk/blender/source/blender/editors/animation/CMakeLists.txt
trunk/blender/source/blender/editors/armature/CMakeLists.txt
trunk/blender/source/blender/editors/curve/CMakeLists.txt
trunk/blender/source/blender/editors/datafiles/CMakeLists.txt
trunk/blender/source/blender/editors/gpencil/CMakeLists.txt
trunk/blender/source/blender/editors/interface/CMakeLists.txt
trunk/blender/source/blender/editors/mesh/CMakeLists.txt
trunk/blender/source/blender/editors/metaball/CMakeLists.txt
trunk/blender/source/blender/editors/object/CMakeLists.txt
trunk/blender/source/blender/editors/physics/CMakeLists.txt
trunk/blender/source/blender/editors/render/CMakeLists.txt
trunk/blender/source/blender/editors/screen/CMakeLists.txt
trunk/blender/source/blender/editors/sculpt_paint/CMakeLists.txt
trunk/blender/source/blender/editors/sound/CMakeLists.txt
trunk/blender/source/blender/editors/space_action/CMakeLists.txt
trunk/blender/source/blender/editors/space_api/CMakeLists.txt
trunk/blender/source/blender/editors/space_buttons/CMakeLists.txt
trunk/blender/source/blender/editors/space_console/CMakeLists.txt
trunk/blender/source/blender/editors/space_file/CMakeLists.txt
trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
trunk/blender/source/blender/editors/space_image/CMakeLists.txt
trunk/blender/source/blender/editors/space_info/CMakeLists.txt
trunk/blender/source/blender/editors/space_logic/CMakeLists.txt
trunk/blender/source/blender/editors/space_nla/CMakeLists.txt
trunk/blender/source/blender/editors/space_node/CMakeLists.txt
trunk/blender/source/blender/editors/space_outliner/CMakeLists.txt
trunk/blender/source/blender/editors/space_script/CMakeLists.txt
trunk/blender/source/blender/editors/space_sequencer/CMakeLists.txt
trunk/blender/source/blender/editors/space_sound/CMakeLists.txt
trunk/blender/source/blender/editors/space_text/CMakeLists.txt
trunk/blender/source/blender/editors/space_time/CMakeLists.txt
trunk/blender/source/blender/editors/space_userpref/CMakeLists.txt
trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
trunk/blender/source/blender/editors/transform/CMakeLists.txt
trunk/blender/source/blender/editors/util/CMakeLists.txt
trunk/blender/source/blender/editors/uvedit/CMakeLists.txt
trunk/blender/source/blender/gpu/CMakeLists.txt
trunk/blender/source/blender/ikplugin/CMakeLists.txt
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/nodes/CMakeLists.txt
trunk/blender/source/blender/python/CMakeLists.txt
trunk/blender/source/blender/python/generic/CMakeLists.txt
trunk/blender/source/blender/readblenfile/CMakeLists.txt
trunk/blender/source/blender/render/CMakeLists.txt
trunk/blender/source/blender/windowmanager/CMakeLists.txt
trunk/blender/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
trunk/blender/source/gameengine/Converter/CMakeLists.txt
trunk/blender/source/gameengine/Expressions/CMakeLists.txt
trunk/blender/source/gameengine/GameLogic/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
trunk/blender/source/gameengine/Network/CMakeLists.txt
trunk/blender/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
trunk/blender/source/gameengine/Physics/Bullet/CMakeLists.txt
trunk/blender/source/gameengine/Physics/Dummy/CMakeLists.txt
trunk/blender/source/gameengine/Physics/common/CMakeLists.txt
trunk/blender/source/gameengine/Rasterizer/CMakeLists.txt
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
trunk/blender/source/gameengine/SceneGraph/CMakeLists.txt
trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt
trunk/blender/source/kernel/CMakeLists.txt
Modified: trunk/blender/extern/bullet2/CMakeLists.txt
===================================================================
--- trunk/blender/extern/bullet2/CMakeLists.txt 2010-10-22 22:58:12 UTC (rev 32660)
+++ trunk/blender/extern/bullet2/CMakeLists.txt 2010-10-23 04:05:55 UTC (rev 32661)
@@ -24,20 +24,125 @@
#
# ***** END GPL LICENSE BLOCK *****
-SET(INC . src)
+SET(INC
+ .
+ src
+)
-FILE(GLOB SRC
- src/LinearMath/*.cpp
- src/BulletCollision/BroadphaseCollision/*.cpp
- src/BulletCollision/CollisionShapes/*.cpp
- src/BulletCollision/NarrowPhaseCollision/*.cpp
- src/BulletCollision/Gimpact/*.cpp
- src/BulletCollision/CollisionDispatch/*.cpp
- src/BulletDynamics/ConstraintSolver/*.cpp
- src/BulletDynamics/Vehicle/*.cpp
- src/BulletDynamics/Dynamics/*.cpp
- src/BulletSoftBody/*.cpp
+SET(SRC
+ src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
+ src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp
+ src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
+ src/BulletCollision/BroadphaseCollision/btDbvt.cpp
+ src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
+ src/BulletCollision/BroadphaseCollision/btDispatcher.cpp
+ src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
+ src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
+ src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
+ src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
+ src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
+ src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp
+ src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
+ src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
+ src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
+ src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
+ src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
+ src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
+ src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
+ src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
+ src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
+ src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
+ src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.cpp
+ src/BulletCollision/CollisionDispatch/btGhostObject.cpp
+ src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
+ src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
+ src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
+ src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
+ src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
+ src/BulletCollision/CollisionDispatch/btUnionFind.cpp
+ src/BulletCollision/CollisionShapes/btBoxShape.cpp
+ src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
+ src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
+ src/BulletCollision/CollisionShapes/btCollisionShape.cpp
+ src/BulletCollision/CollisionShapes/btCompoundShape.cpp
+ src/BulletCollision/CollisionShapes/btConcaveShape.cpp
+ src/BulletCollision/CollisionShapes/btConeShape.cpp
+ src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
+ src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
+ src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
+ src/BulletCollision/CollisionShapes/btConvexShape.cpp
+ src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
+ src/BulletCollision/CollisionShapes/btCylinderShape.cpp
+ src/BulletCollision/CollisionShapes/btEmptyShape.cpp
+ src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
+ src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
+ src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
+ src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
+ src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
+ src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
+ src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
+ src/BulletCollision/CollisionShapes/btShapeHull.cpp
+ src/BulletCollision/CollisionShapes/btSphereShape.cpp
+ src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
+ src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
+ src/BulletCollision/CollisionShapes/btTetrahedronShape.cpp
+ src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
+ src/BulletCollision/CollisionShapes/btTriangleCallback.cpp
+ src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
+ src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
+ src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
+ src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
+ src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
+ src/BulletCollision/Gimpact/btContactProcessing.cpp
+ src/BulletCollision/Gimpact/btGImpactBvh.cpp
+ src/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.cpp
+ src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
+ src/BulletCollision/Gimpact/btGImpactShape.cpp
+ src/BulletCollision/Gimpact/btGenericPoolAllocator.cpp
+ src/BulletCollision/Gimpact/btTriangleShapeEx.cpp
+ src/BulletCollision/Gimpact/gim_box_set.cpp
+ src/BulletCollision/Gimpact/gim_contact.cpp
+ src/BulletCollision/Gimpact/gim_memory.cpp
+ src/BulletCollision/Gimpact/gim_tri_collision.cpp
+ src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
+ src/BulletCollision/NarrowPhaseCollision/btConvexCast.cpp
+ src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
+ src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp
+ src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
+ src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
+ src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
+ src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
+ src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
+ src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
+ src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
+ src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
+ src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
+ src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
+ src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
+ src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
+ src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
+ src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
+ src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
+ src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.cpp
+ src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
+ src/BulletDynamics/Dynamics/Bullet-C-API.cpp
+ src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
+ src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
+ src/BulletDynamics/Dynamics/btRigidBody.cpp
+ src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
+ src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
+ src/BulletDynamics/Vehicle/btWheelInfo.cpp
+ src/BulletSoftBody/btSoftBody.cpp
+ src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
+ src/BulletSoftBody/btSoftBodyHelpers.cpp
+ src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
+ src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
+ src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
+ src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
+ src/LinearMath/btAlignedAllocator.cpp
+ src/LinearMath/btConvexHull.cpp
+ src/LinearMath/btGeometryUtil.cpp
+ src/LinearMath/btQuickprof.cpp
)
BLENDERLIB(extern_bullet "${SRC}" "${INC}")
-
Modified: trunk/blender/extern/libopenjpeg/CMakeLists.txt
===================================================================
--- trunk/blender/extern/libopenjpeg/CMakeLists.txt 2010-10-22 22:58:12 UTC (rev 32660)
+++ trunk/blender/extern/libopenjpeg/CMakeLists.txt 2010-10-23 04:05:55 UTC (rev 32661)
@@ -24,7 +24,29 @@
#
# ***** END GPL LICENSE BLOCK *****
-SET(INC .)
+SET(INC
+ .
+)
-FILE(GLOB SRC *.c)
+SET(SRC
+ bio.c
+ cio.c
+ dwt.c
+ event.c
+ image.c
+ j2k.c
+ j2k_lib.c
+ jp2.c
+ jpt.c
+ mct.c
+ mqc.c
+ openjpeg.c
+ pi.c
+ raw.c
+ t1.c
+ t2.c
+ tcd.c
+ tgt.c
+)
+
BLENDERLIB(extern_openjpeg "${SRC}" "${INC}")
Modified: trunk/blender/extern/lzma/CMakeLists.txt
===================================================================
--- trunk/blender/extern/lzma/CMakeLists.txt 2010-10-22 22:58:12 UTC (rev 32660)
+++ trunk/blender/extern/lzma/CMakeLists.txt 2010-10-23 04:05:55 UTC (rev 32661)
@@ -24,8 +24,16 @@
#
# ***** END GPL LICENSE BLOCK *****
-SET(INC . )
+SET(INC
+ .
+)
-FILE(GLOB SRC ./*.c)
+SET(SRC
+ Alloc.c
+ LzFind.c
+ LzmaDec.c
+ LzmaEnc.c
+ LzmaLib.c
+)
BLENDERLIB(extern_lzma "${SRC}" "${INC}")
Modified: trunk/blender/extern/lzo/CMakeLists.txt
===================================================================
--- trunk/blender/extern/lzo/CMakeLists.txt 2010-10-22 22:58:12 UTC (rev 32660)
+++ trunk/blender/extern/lzo/CMakeLists.txt 2010-10-23 04:05:55 UTC (rev 32661)
@@ -24,7 +24,12 @@
#
# ***** END GPL LICENSE BLOCK *****
-SET(INC include)
-SET(SRC minilzo/minilzo.c)
+SET(INC
+ include
+)
+SET(SRC
+ minilzo/minilzo.c
+)
+
BLENDERLIB(extern_minilzo "${SRC}" "${INC}")
Modified: trunk/blender/intern/audaspace/CMakeLists.txt
===================================================================
--- trunk/blender/intern/audaspace/CMakeLists.txt 2010-10-22 22:58:12 UTC (rev 32660)
+++ trunk/blender/intern/audaspace/CMakeLists.txt 2010-10-23 04:05:55 UTC (rev 32661)
@@ -28,52 +28,156 @@
${LIBSAMPLERATE_INC}
)
-FILE(GLOB SRC
- intern/*.cpp
- intern/*.h
- FX/*.cpp
- SRC/*.cpp
+SET(SRC
+ FX/AUD_AccumulatorFactory.cpp
+ FX/AUD_BaseIIRFilterReader.cpp
+ FX/AUD_ButterworthFactory.cpp
+ FX/AUD_CallbackIIRFilterReader.cpp
+ FX/AUD_DelayFactory.cpp
+ FX/AUD_DelayReader.cpp
+ FX/AUD_DoubleFactory.cpp
+ FX/AUD_DoubleReader.cpp
+ FX/AUD_EffectFactory.cpp
+ FX/AUD_EffectReader.cpp
+ FX/AUD_EnvelopeFactory.cpp
+ FX/AUD_FaderFactory.cpp
+ FX/AUD_FaderReader.cpp
+ FX/AUD_HighpassFactory.cpp
+ FX/AUD_IIRFilterFactory.cpp
+ FX/AUD_IIRFilterReader.cpp
+ FX/AUD_LimiterFactory.cpp
+ FX/AUD_LimiterReader.cpp
+ FX/AUD_LoopFactory.cpp
+ FX/AUD_LoopReader.cpp
+ FX/AUD_LowpassFactory.cpp
+ FX/AUD_PingPongFactory.cpp
+ FX/AUD_PitchFactory.cpp
+ FX/AUD_PitchReader.cpp
+ FX/AUD_RectifyFactory.cpp
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list