From c6976e7351e448b8ab82757b9e1a665162b0960c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 23 Oct 2010 04:05:55 +0000 Subject: 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. --- intern/audaspace/CMakeLists.txt | 140 ++++++++++++++++++++++++++++++++++----- intern/boolop/CMakeLists.txt | 19 +++++- intern/bsp/CMakeLists.txt | 6 +- intern/container/CMakeLists.txt | 8 ++- intern/decimation/CMakeLists.txt | 11 ++- intern/elbeem/CMakeLists.txt | 32 ++++++++- intern/iksolver/CMakeLists.txt | 9 ++- intern/itasc/CMakeLists.txt | 42 +++++++++++- intern/memutil/CMakeLists.txt | 5 +- intern/moto/CMakeLists.txt | 19 +++++- intern/opennl/CMakeLists.txt | 40 ++++++++++- intern/smoke/CMakeLists.txt | 11 ++- intern/string/CMakeLists.txt | 9 ++- 13 files changed, 315 insertions(+), 36 deletions(-) (limited to 'intern') diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index 6982bd83276..2dd4694d8a9 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -28,52 +28,156 @@ SET(INC ${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 + FX/AUD_ReverseFactory.cpp + FX/AUD_ReverseReader.cpp + FX/AUD_SquareFactory.cpp + FX/AUD_SumFactory.cpp + FX/AUD_SuperposeFactory.cpp + FX/AUD_SuperposeReader.cpp + FX/AUD_VolumeFactory.cpp + SRC/AUD_SRCResampleFactory.cpp + SRC/AUD_SRCResampleReader.cpp + intern/AUD_3DMath.h + intern/AUD_Buffer.cpp + intern/AUD_Buffer.h + intern/AUD_BufferReader.cpp + intern/AUD_BufferReader.h + intern/AUD_C-API.cpp + intern/AUD_C-API.h + intern/AUD_ChannelMapperFactory.cpp + intern/AUD_ChannelMapperFactory.h + intern/AUD_ChannelMapperReader.cpp + intern/AUD_ChannelMapperReader.h + intern/AUD_ConverterFactory.cpp + intern/AUD_ConverterFactory.h + intern/AUD_ConverterFunctions.cpp + intern/AUD_ConverterFunctions.h + intern/AUD_ConverterReader.cpp + intern/AUD_ConverterReader.h + intern/AUD_DefaultMixer.cpp + intern/AUD_DefaultMixer.h + intern/AUD_FileFactory.cpp + intern/AUD_FileFactory.h + intern/AUD_I3DDevice.h + intern/AUD_IDevice.h + intern/AUD_IFactory.h + intern/AUD_IReader.h + intern/AUD_LinearResampleFactory.cpp + intern/AUD_LinearResampleFactory.h + intern/AUD_LinearResampleReader.cpp + intern/AUD_LinearResampleReader.h + intern/AUD_Mixer.cpp + intern/AUD_Mixer.h + intern/AUD_MixerFactory.cpp + intern/AUD_MixerFactory.h + intern/AUD_NULLDevice.cpp + intern/AUD_NULLDevice.h + intern/AUD_PyInit.h + intern/AUD_ReadDevice.cpp + intern/AUD_ReadDevice.h + intern/AUD_Reference.h + intern/AUD_ResampleFactory.h + intern/AUD_SequencerFactory.cpp + intern/AUD_SequencerFactory.h + intern/AUD_SequencerReader.cpp + intern/AUD_SequencerReader.h + intern/AUD_SilenceFactory.cpp + intern/AUD_SilenceFactory.h + intern/AUD_SilenceReader.cpp + intern/AUD_SilenceReader.h + intern/AUD_SinusFactory.cpp + intern/AUD_SinusFactory.h + intern/AUD_SinusReader.cpp + intern/AUD_SinusReader.h + intern/AUD_SoftwareDevice.cpp + intern/AUD_SoftwareDevice.h + intern/AUD_Space.h + intern/AUD_StreamBufferFactory.cpp + intern/AUD_StreamBufferFactory.h ) IF(WITH_FFMPEG) - LIST(APPEND INC ffmpeg ${FFMPEG_INC}) - FILE(GLOB FFMPEGSRC ffmpeg/*.cpp) ADD_DEFINITIONS(-DWITH_FFMPEG) + LIST(APPEND INC ffmpeg ${FFMPEG_INC}) + SET(FFMPEGSRC + ffmpeg/AUD_FFMPEGFactory.cpp + ffmpeg/AUD_FFMPEGReader.cpp + ) ENDIF(WITH_FFMPEG) IF(WITH_SDL) - LIST(APPEND INC SDL ${SDL_INCLUDE_DIR}) - FILE(GLOB SDLSRC SDL/*.cpp) ADD_DEFINITIONS(-DWITH_SDL) + LIST(APPEND INC SDL ${SDL_INCLUDE_DIR}) + SET(SDLSRC + SDL/AUD_SDLDevice.cpp + ) ENDIF(WITH_SDL) IF(WITH_OPENAL) - LIST(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR}) - FILE(GLOB OPENALSRC OpenAL/*.cpp) ADD_DEFINITIONS(-DWITH_OPENAL) + LIST(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR}) + SET(OPENALSRC + OpenAL/AUD_OpenALDevice.cpp + ) ENDIF(WITH_OPENAL) IF(WITH_JACK) - LIST(APPEND INC jack ${JACK_INC}) - FILE(GLOB JACKSRC jack/*.cpp) ADD_DEFINITIONS(-DWITH_JACK) + LIST(APPEND INC jack ${JACK_INC}) + SET(JACKSRC + jack/AUD_JackDevice.cpp + ) ENDIF(WITH_JACK) IF(WITH_SNDFILE) - LIST(APPEND INC sndfile ${SNDFILE_INC}) - FILE(GLOB SNDFILESRC sndfile/*.cpp) ADD_DEFINITIONS(-DWITH_SNDFILE) + LIST(APPEND INC sndfile ${SNDFILE_INC}) + SET(SNDFILESRC + sndfile/AUD_SndFileFactory.cpp + sndfile/AUD_SndFileReader.cpp + ) ENDIF(WITH_SNDFILE) #IF(WITH_FFTW3) -# LIST(APPEND INC fftw ${FFTW3_INC}) -# FILE(GLOB FFTW3SRC fftw/*.cpp) # ADD_DEFINITIONS(-DWITH_FFTW3) +# LIST(APPEND INC fftw ${FFTW3_INC}) +# SET(FFTW3SRC +# fftw/AUD_BandPassFactory.cpp +# fftw/AUD_BandPassReader.cpp +# ) #ENDIF(WITH_FFTW3) IF(WITH_PYTHON) LIST(APPEND INC Python ${PYTHON_INC}) - FILE(GLOB PYTHONSRC Python/*.cpp) + SET(PYTHONSRC + Python/AUD_PyAPI.cpp + ) ELSE(WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) ENDIF(WITH_PYTHON) diff --git a/intern/boolop/CMakeLists.txt b/intern/boolop/CMakeLists.txt index 91500712a4c..4b261900521 100644 --- a/intern/boolop/CMakeLists.txt +++ b/intern/boolop/CMakeLists.txt @@ -36,6 +36,23 @@ SET(INC ../../source/blender/makesdna ) -FILE(GLOB SRC intern/*.cpp) +SET(SRC + intern/BOP_BBox.cpp + intern/BOP_BSPNode.cpp + intern/BOP_BSPTree.cpp + intern/BOP_Edge.cpp + intern/BOP_Face.cpp + intern/BOP_Face2Face.cpp + intern/BOP_Interface.cpp + intern/BOP_MathUtils.cpp + intern/BOP_Merge.cpp + intern/BOP_Merge2.cpp + intern/BOP_Mesh.cpp + intern/BOP_Segment.cpp + intern/BOP_Splitter.cpp + intern/BOP_Tag.cpp + intern/BOP_Triangulator.cpp + intern/BOP_Vertex.cpp +) BLENDERLIB(bf_intern_bop "${SRC}" "${INC}") diff --git a/intern/bsp/CMakeLists.txt b/intern/bsp/CMakeLists.txt index debbc86c240..358c02fec73 100644 --- a/intern/bsp/CMakeLists.txt +++ b/intern/bsp/CMakeLists.txt @@ -31,6 +31,10 @@ SET(INC ../memutil ) -FILE(GLOB SRC intern/*.cpp) +SET(SRC + intern/BSP_CSGMesh.cpp + intern/BSP_MeshPrimitives.cpp + intern/CSG_BooleanOps.cpp +) BLENDERLIB(bf_intern_bsp "${SRC}" "${INC}") diff --git a/intern/container/CMakeLists.txt b/intern/container/CMakeLists.txt index 9ae684ec542..393883cb148 100644 --- a/intern/container/CMakeLists.txt +++ b/intern/container/CMakeLists.txt @@ -24,8 +24,12 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC .) +SET(INC + . +) -FILE(GLOB SRC intern/*.cpp) +SET(SRC + intern/CTR_List.cpp +) BLENDERLIB(bf_intern_ctr "${SRC}" "${INC}") diff --git a/intern/decimation/CMakeLists.txt b/intern/decimation/CMakeLists.txt index 77ab6249e7f..c284ed087fd 100644 --- a/intern/decimation/CMakeLists.txt +++ b/intern/decimation/CMakeLists.txt @@ -31,6 +31,15 @@ SET(INC ../moto/include ) -FILE(GLOB SRC intern/*.cpp) +SET(SRC + intern/LOD_EdgeCollapser.cpp + intern/LOD_ExternNormalEditor.cpp + intern/LOD_FaceNormalEditor.cpp + intern/LOD_ManMesh2.cpp + intern/LOD_MeshPrimitives.cpp + intern/LOD_QSDecimator.cpp + intern/LOD_QuadricEditor.cpp + intern/LOD_decimation.cpp +) BLENDERLIB(bf_intern_decimate "${SRC}" "${INC}") diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index 57fb6180adb..a4ee5927216 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -24,9 +24,37 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC ${PNG_INC} ${ZLIB_INC} extern) +SET(INC + extern + ${PNG_INC} + ${ZLIB_INC} +) -FILE(GLOB SRC intern/*.cpp) +SET(SRC + intern/attributes.cpp + intern/controlparticles.cpp + intern/elbeem.cpp + intern/elbeem_control.cpp + intern/isosurface.cpp + intern/mvmcoords.cpp + intern/ntl_blenderdumper.cpp + intern/ntl_bsptree.cpp + intern/ntl_geometrymodel.cpp + intern/ntl_geometryobject.cpp + intern/ntl_lighting.cpp + intern/ntl_ray.cpp + intern/ntl_world.cpp + intern/parametrizer.cpp + intern/particletracer.cpp + intern/simulation_object.cpp + intern/solver_adap.cpp + intern/solver_control.cpp + intern/solver_init.cpp + intern/solver_interface.cpp + intern/solver_main.cpp + intern/solver_util.cpp + intern/utilities.cpp +) ADD_DEFINITIONS(-DNOGUI -DELBEEM_BLENDER=1) IF(WINDOWS) diff --git a/intern/iksolver/CMakeLists.txt b/intern/iksolver/CMakeLists.txt index 50ae78d6d16..11bad7ed5f6 100644 --- a/intern/iksolver/CMakeLists.txt +++ b/intern/iksolver/CMakeLists.txt @@ -30,6 +30,13 @@ SET(INC ../moto/include ) -FILE(GLOB SRC intern/*.cpp) +SET(SRC + intern/IK_QJacobian.cpp + intern/IK_QJacobianSolver.cpp + intern/IK_QSegment.cpp + intern/IK_QTask.cpp + intern/IK_Solver.cpp + intern/MT_ExpMap.cpp +) BLENDERLIB(bf_intern_ik "${SRC}" "${INC}") diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt index 88f902b38c8..c8d2bbb6987 100644 --- a/intern/itasc/CMakeLists.txt +++ b/intern/itasc/CMakeLists.txt @@ -24,8 +24,46 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC ../../extern/Eigen2) +SET(INC + ../../extern/Eigen2 +) -FILE(GLOB SRC *.cpp kdl/*.cpp kdl/utilities/*.cpp) +SET(SRC + Armature.cpp + Cache.cpp + ConstraintSet.cpp + ControlledObject.cpp + CopyPose.cpp + Distance.cpp + FixedObject.cpp + MovingFrame.cpp + Scene.cpp + UncontrolledObject.cpp + WDLSSolver.cpp + WSDLSSolver.cpp + WorldObject.cpp + eigen_types.cpp + kdl/chain.cpp + kdl/chainfksolverpos_recursive.cpp + kdl/chainjnttojacsolver.cpp + kdl/frameacc.cpp + kdl/frames.cpp + kdl/frames_io.cpp + kdl/framevel.cpp + kdl/inertia.cpp + kdl/jacobian.cpp + kdl/jntarray.cpp + kdl/jntarrayacc.cpp + kdl/jntarrayvel.cpp + kdl/joint.cpp + kdl/kinfam_io.cpp + kdl/segment.cpp + kdl/tree.cpp + kdl/treefksolverpos_recursive.cpp + kdl/treejnttojacsolver.cpp + kdl/utilities/error_stack.cpp + kdl/utilities/utility.cpp + kdl/utilities/utility_io.cpp +) BLENDERLIB(bf_intern_itasc "${SRC}" "${INC}") diff --git a/intern/memutil/CMakeLists.txt b/intern/memutil/CMakeLists.txt index ebbc53403f4..10bb6733c93 100644 --- a/intern/memutil/CMakeLists.txt +++ b/intern/memutil/CMakeLists.txt @@ -24,7 +24,10 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC . ..) +SET(INC + . + .. +) SET(SRC ./intern/MEM_CacheLimiterC-Api.cpp diff --git a/intern/moto/CMakeLists.txt b/intern/moto/CMakeLists.txt index 91c523eced9..f3300ec562b 100644 --- a/intern/moto/CMakeLists.txt +++ b/intern/moto/CMakeLists.txt @@ -24,8 +24,23 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC include) +SET(INC + include +) -FILE(GLOB SRC intern/*.cpp) +SET(SRC + intern/MT_Assert.cpp + intern/MT_CmMatrix4x4.cpp + intern/MT_Matrix3x3.cpp + intern/MT_Matrix4x4.cpp + intern/MT_Plane3.cpp + intern/MT_Point3.cpp + intern/MT_Quaternion.cpp + intern/MT_Transform.cpp + intern/MT_Vector2.cpp + intern/MT_Vector3.cpp + intern/MT_Vector4.cpp + intern/MT_random.cpp +) BLENDERLIB(bf_intern_moto "${SRC}" "${INC}") diff --git a/intern/opennl/CMakeLists.txt b/intern/opennl/CMakeLists.txt index b29eaa680b6..900bad543ac 100644 --- a/intern/opennl/CMakeLists.txt +++ b/intern/opennl/CMakeLists.txt @@ -24,8 +24,44 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC extern superlu) +SET(INC + extern + superlu +) -FILE(GLOB SRC intern/*.c superlu/*.c) +SET(SRC + intern/opennl.c + superlu/colamd.c + superlu/get_perm_c.c + superlu/heap_relax_snode.c + superlu/lsame.c + superlu/memory.c + superlu/mmd.c + superlu/relax_snode.c + superlu/scolumn_bmod.c + superlu/scolumn_dfs.c + superlu/scopy_to_ucol.c + superlu/sgssv.c + superlu/sgstrf.c + superlu/sgstrs.c + superlu/smemory.c + superlu/smyblas2.c + superlu/sp_coletree.c + superlu/sp_ienv.c + superlu/sp_preorder.c + superlu/spanel_bmod.c + superlu/spanel_dfs.c + superlu/spivotL.c + superlu/spruneL.c + superlu/ssnode_bmod.c + superlu/ssnode_dfs.c + superlu/ssp_blas2.c + superlu/ssp_blas3.c + superlu/strsv.c + superlu/superlu_timer.c + superlu/sutil.c + superlu/util.c + superlu/xerbla.c +) BLENDERLIB(bf_intern_opennl "${SRC}" "${INC}") diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt index 6c844cbd232..741301f04da 100644 --- a/intern/smoke/CMakeLists.txt +++ b/intern/smoke/CMakeLists.txt @@ -33,7 +33,16 @@ SET(INC ${ZLIB_INC} ) -FILE(GLOB SRC intern/*.cpp) +SET(SRC + intern/EIGENVALUE_HELPER.cpp + intern/FLUID_3D.cpp + intern/FLUID_3D_SOLVERS.cpp + intern/FLUID_3D_STATIC.cpp + intern/LU_HELPER.cpp + intern/SPHERE.cpp + intern/WTURBULENCE.cpp + intern/smoke_API.cpp +) IF(WITH_OPENMP) ADD_DEFINITIONS(-DPARALLEL=1) diff --git a/intern/string/CMakeLists.txt b/intern/string/CMakeLists.txt index a1b130d93be..399de33e043 100644 --- a/intern/string/CMakeLists.txt +++ b/intern/string/CMakeLists.txt @@ -24,7 +24,12 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC .) -SET(SRC ./intern/STR_String.cpp) +SET(INC + . +) + +SET(SRC + ./intern/STR_String.cpp +) BLENDERLIB(bf_intern_string "${SRC}" "${INC}") -- cgit v1.2.3