diff options
Diffstat (limited to 'intern')
-rw-r--r-- | intern/CMakeLists.txt | 46 | ||||
-rw-r--r-- | intern/audaspace/CMakeLists.txt | 86 | ||||
-rw-r--r-- | intern/boolop/CMakeLists.txt | 6 | ||||
-rw-r--r-- | intern/bsp/CMakeLists.txt | 6 | ||||
-rw-r--r-- | intern/container/CMakeLists.txt | 6 | ||||
-rw-r--r-- | intern/decimation/CMakeLists.txt | 6 | ||||
-rw-r--r-- | intern/elbeem/CMakeLists.txt | 20 | ||||
-rw-r--r-- | intern/ghost/CMakeLists.txt | 46 | ||||
-rw-r--r-- | intern/guardedalloc/CMakeLists.txt | 20 | ||||
-rw-r--r-- | intern/iksolver/CMakeLists.txt | 6 | ||||
-rw-r--r-- | intern/itasc/CMakeLists.txt | 6 | ||||
-rw-r--r-- | intern/memutil/CMakeLists.txt | 6 | ||||
-rw-r--r-- | intern/moto/CMakeLists.txt | 6 | ||||
-rw-r--r-- | intern/opennl/CMakeLists.txt | 8 | ||||
-rw-r--r-- | intern/smoke/CMakeLists.txt | 20 | ||||
-rw-r--r-- | intern/string/CMakeLists.txt | 6 |
16 files changed, 150 insertions, 150 deletions
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index a497d8f2078..3eed1ef54d2 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -24,30 +24,30 @@ # # ***** END GPL LICENSE BLOCK ***** -ADD_SUBDIRECTORY(audaspace) -ADD_SUBDIRECTORY(string) -ADD_SUBDIRECTORY(ghost) -ADD_SUBDIRECTORY(guardedalloc) -ADD_SUBDIRECTORY(moto) -ADD_SUBDIRECTORY(memutil) -ADD_SUBDIRECTORY(iksolver) -ADD_SUBDIRECTORY(opennl) -ADD_SUBDIRECTORY(smoke) +add_subdirectory(audaspace) +add_subdirectory(string) +add_subdirectory(ghost) +add_subdirectory(guardedalloc) +add_subdirectory(moto) +add_subdirectory(memutil) +add_subdirectory(iksolver) +add_subdirectory(opennl) +add_subdirectory(smoke) -IF(WITH_MOD_FLUID) - ADD_SUBDIRECTORY(elbeem) -ENDIF(WITH_MOD_FLUID) +if(WITH_MOD_FLUID) + add_subdirectory(elbeem) +endif() -IF(WITH_MOD_DECIMATE) - ADD_SUBDIRECTORY(container) - ADD_SUBDIRECTORY(decimation) -ENDIF(WITH_MOD_DECIMATE) +if(WITH_MOD_DECIMATE) + add_subdirectory(container) + add_subdirectory(decimation) +endif() -IF(WITH_MOD_BOOLEAN) - ADD_SUBDIRECTORY(boolop) - ADD_SUBDIRECTORY(bsp) -ENDIF(WITH_MOD_BOOLEAN) +if(WITH_MOD_BOOLEAN) + add_subdirectory(boolop) + add_subdirectory(bsp) +endif() -IF(WITH_IK_ITASC) - ADD_SUBDIRECTORY(itasc) -ENDIF(WITH_IK_ITASC) +if(WITH_IK_ITASC) + add_subdirectory(itasc) +endif() diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index 440233eacbc..1805e7ed494 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -20,7 +20,7 @@ # # ***** END LGPL LICENSE BLOCK ***** -SET(INC +set(INC . intern FX SRC @@ -28,7 +28,7 @@ SET(INC ${LIBSAMPLERATE_INC} ) -SET(SRC +set(SRC FX/AUD_AccumulatorFactory.cpp FX/AUD_BaseIIRFilterReader.cpp FX/AUD_ButterworthFactory.cpp @@ -153,94 +153,94 @@ SET(SRC FX/AUD_VolumeFactory.h ) -IF(WITH_CODEC_FFMPEG) - ADD_DEFINITIONS(-DWITH_FFMPEG) - LIST(APPEND INC ffmpeg ${FFMPEG_INC}) - SET(FFMPEGSRC +if(WITH_CODEC_FFMPEG) + add_definitions(-DWITH_FFMPEG) + list(APPEND INC ffmpeg ${FFMPEG_INC}) + set(FFMPEGSRC ffmpeg/AUD_FFMPEGFactory.cpp ffmpeg/AUD_FFMPEGReader.cpp ffmpeg/AUD_FFMPEGFactory.h ffmpeg/AUD_FFMPEGReader.h ) -ENDIF(WITH_CODEC_FFMPEG) +endif() -IF(WITH_SDL) - ADD_DEFINITIONS(-DWITH_SDL) - LIST(APPEND INC SDL ${SDL_INCLUDE_DIR}) - SET(SDLSRC +if(WITH_SDL) + add_definitions(-DWITH_SDL) + list(APPEND INC SDL ${SDL_INCLUDE_DIR}) + set(SDLSRC SDL/AUD_SDLDevice.cpp SDL/AUD_SDLDevice.h ) -ENDIF(WITH_SDL) +endif() -IF(WITH_OPENAL) - ADD_DEFINITIONS(-DWITH_OPENAL) - LIST(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR}) - SET(OPENALSRC +if(WITH_OPENAL) + add_definitions(-DWITH_OPENAL) + list(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR}) + set(OPENALSRC OpenAL/AUD_OpenALDevice.cpp OpenAL/AUD_OpenALDevice.h ) -ENDIF(WITH_OPENAL) +endif() -IF(WITH_JACK) - ADD_DEFINITIONS(-DWITH_JACK) - LIST(APPEND INC jack ${JACK_INC}) - SET(JACKSRC +if(WITH_JACK) + add_definitions(-DWITH_JACK) + list(APPEND INC jack ${JACK_INC}) + set(JACKSRC jack/AUD_JackDevice.cpp jack/AUD_JackDevice.h ) -ENDIF(WITH_JACK) +endif() -IF(WITH_CODEC_SNDFILE) - ADD_DEFINITIONS(-DWITH_SNDFILE) - LIST(APPEND INC sndfile ${SNDFILE_INC}) - SET(SNDFILESRC +if(WITH_CODEC_SNDFILE) + add_definitions(-DWITH_SNDFILE) + list(APPEND INC sndfile ${SNDFILE_INC}) + set(SNDFILESRC sndfile/AUD_SndFileFactory.cpp sndfile/AUD_SndFileReader.cpp sndfile/AUD_SndFileFactory.h sndfile/AUD_SndFileReader.h ) -ENDIF(WITH_CODEC_SNDFILE) +endif() -IF(WITH_SAMPLERATE) - ADD_DEFINITIONS(-DWITH_SAMPLERATE) - SET(SRCFILESRC +if(WITH_SAMPLERATE) + add_definitions(-DWITH_SAMPLERATE) + set(SRCFILESRC SRC/AUD_SRCResampleFactory.cpp SRC/AUD_SRCResampleReader.cpp SRC/AUD_SRCResampleFactory.h SRC/AUD_SRCResampleReader.h ) -ENDIF(WITH_SAMPLERATE) +endif() -IF(WITH_FFTW3 AND FALSE) - ADD_DEFINITIONS(-DWITH_FFTW3) - LIST(APPEND INC fftw ${FFTW3_INC}) - SET(FFTW3SRC +if(WITH_FFTW3 AND FALSE) + add_definitions(-DWITH_FFTW3) + list(APPEND INC fftw ${FFTW3_INC}) + set(FFTW3SRC fftw/AUD_BandPassFactory.cpp fftw/AUD_BandPassReader.cpp fftw/AUD_BandPassFactory.h fftw/AUD_BandPassReader.h ) -ENDIF(WITH_FFTW3 AND FALSE) +endif() -IF(WITH_PYTHON) - LIST(APPEND INC Python ${PYTHON_INC}) - SET(PYTHONSRC +if(WITH_PYTHON) + list(APPEND INC Python ${PYTHON_INC}) + set(PYTHONSRC Python/AUD_PyAPI.cpp Python/AUD_PyAPI.h ) - ADD_DEFINITIONS(-DWITH_PYTHON) -ENDIF(WITH_PYTHON) + add_definitions(-DWITH_PYTHON) +endif() -SET(SRC +set(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} @@ -252,4 +252,4 @@ SET(SRC ${PYTHONSRC} ) -BLENDERLIB(bf_intern_audaspace "${SRC}" "${INC}") +blenderlib(bf_intern_audaspace "${SRC}" "${INC}") diff --git a/intern/boolop/CMakeLists.txt b/intern/boolop/CMakeLists.txt index ae570505235..dcc152531c4 100644 --- a/intern/boolop/CMakeLists.txt +++ b/intern/boolop/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ./intern ./extern @@ -36,7 +36,7 @@ SET(INC ../../source/blender/makesdna ) -SET(SRC +set(SRC intern/BOP_BBox.cpp intern/BOP_BSPNode.cpp intern/BOP_BSPTree.cpp @@ -75,4 +75,4 @@ SET(SRC intern/BOP_Vertex.h ) -BLENDERLIB(bf_intern_bop "${SRC}" "${INC}") +blenderlib(bf_intern_bop "${SRC}" "${INC}") diff --git a/intern/bsp/CMakeLists.txt b/intern/bsp/CMakeLists.txt index 6799ba563e9..82abcf86a34 100644 --- a/intern/bsp/CMakeLists.txt +++ b/intern/bsp/CMakeLists.txt @@ -24,14 +24,14 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ./intern ../container ../moto/include ../memutil ) -SET(SRC +set(SRC intern/BSP_CSGMesh.cpp intern/BSP_MeshPrimitives.cpp intern/CSG_BooleanOps.cpp @@ -43,4 +43,4 @@ SET(SRC intern/BSP_MeshPrimitives.h ) -BLENDERLIB(bf_intern_bsp "${SRC}" "${INC}") +blenderlib(bf_intern_bsp "${SRC}" "${INC}") diff --git a/intern/container/CMakeLists.txt b/intern/container/CMakeLists.txt index 207271fcb7c..e603e2701eb 100644 --- a/intern/container/CMakeLists.txt +++ b/intern/container/CMakeLists.txt @@ -24,11 +24,11 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ) -SET(SRC +set(SRC intern/CTR_List.cpp CTR_List.h @@ -38,4 +38,4 @@ SET(SRC CTR_UHeap.h ) -BLENDERLIB(bf_intern_ctr "${SRC}" "${INC}") +blenderlib(bf_intern_ctr "${SRC}" "${INC}") diff --git a/intern/decimation/CMakeLists.txt b/intern/decimation/CMakeLists.txt index 934624e1f04..14998415031 100644 --- a/intern/decimation/CMakeLists.txt +++ b/intern/decimation/CMakeLists.txt @@ -24,14 +24,14 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../container ../memutil ../moto/include ) -SET(SRC +set(SRC intern/LOD_EdgeCollapser.cpp intern/LOD_ExternNormalEditor.cpp intern/LOD_FaceNormalEditor.cpp @@ -56,4 +56,4 @@ SET(SRC intern/LOD_QuadricEditor.h ) -BLENDERLIB(bf_intern_decimate "${SRC}" "${INC}") +blenderlib(bf_intern_decimate "${SRC}" "${INC}") diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index dcbc15f2cde..8d6f3fa0a9f 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -24,13 +24,13 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC extern ${PNG_INC} ${ZLIB_INC} ) -SET(SRC +set(SRC intern/attributes.cpp intern/controlparticles.cpp intern/elbeem.cpp @@ -86,13 +86,13 @@ SET(SRC intern/utilities.h ) -ADD_DEFINITIONS(-DNOGUI -DELBEEM_BLENDER=1) -IF(WINDOWS) - ADD_DEFINITIONS(-DUSE_MSVC6FIXES) -ENDIF(WINDOWS) +add_definitions(-DNOGUI -DELBEEM_BLENDER=1) +if(WINDOWS) + add_definitions(-DUSE_MSVC6FIXES) +endif() -IF(WITH_OPENMP) - ADD_DEFINITIONS(-DPARALLEL=1) -ENDIF(WITH_OPENMP) +if(WITH_OPENMP) + add_definitions(-DPARALLEL=1) +endif() -BLENDERLIB_NOLIST(bf_intern_elbeem "${SRC}" "${INC}") +blenderlib_nolist(bf_intern_elbeem "${SRC}" "${INC}") diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index fa0a3eea393..509741092c5 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ../string ../../extern/glew/include @@ -32,7 +32,7 @@ SET(INC ../../source/blender/makesdna ) -SET(SRC +set(SRC intern/GHOST_Buttons.cpp intern/GHOST_CallbackEventConsumer.cpp intern/GHOST_C-api.cpp @@ -82,9 +82,9 @@ SET(SRC intern/GHOST_WindowManager.h ) -IF(APPLE) - IF(WITH_COCOA) - LIST(APPEND SRC +if(APPLE) + if(WITH_COCOA) + list(APPEND SRC intern/GHOST_DisplayManagerCocoa.mm intern/GHOST_SystemCocoa.mm intern/GHOST_WindowCocoa.mm @@ -93,8 +93,8 @@ IF(APPLE) intern/GHOST_SystemCocoa.h intern/GHOST_WindowCocoa.h ) - ELSE(WITH_COCOA) - LIST(APPEND SRC + else() + list(APPEND SRC intern/GHOST_DisplayManagerCarbon.cpp intern/GHOST_SystemCarbon.cpp intern/GHOST_WindowCarbon.cpp @@ -103,16 +103,16 @@ IF(APPLE) intern/GHOST_SystemCarbon.h intern/GHOST_WindowCarbon.h ) - ENDIF(WITH_COCOA) + endif() - IF(WITH_CODEC_QUICKTIME) - ADD_DEFINITIONS(-DWITH_QUICKTIME) - ENDIF(WITH_CODEC_QUICKTIME) + if(WITH_CODEC_QUICKTIME) + add_definitions(-DWITH_QUICKTIME) + endif() -ELSEIF(UNIX) - LIST(APPEND INC ${X11_X11_INCLUDE_PATH}) +elseif(UNIX) + list(APPEND INC ${X11_X11_INCLUDE_PATH}) - LIST(APPEND SRC + list(APPEND SRC intern/GHOST_DisplayManagerX11.cpp intern/GHOST_SystemX11.cpp intern/GHOST_WindowX11.cpp @@ -122,16 +122,16 @@ ELSEIF(UNIX) intern/GHOST_WindowX11.h ) - ADD_DEFINITIONS(-DPREFIX="${CMAKE_INSTALL_PREFIX}") + add_definitions(-DPREFIX="${CMAKE_INSTALL_PREFIX}") -ELSEIF(WIN32) - IF(MSVC) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") - ENDIF(MSVC) +elseif(WIN32) + if(MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") + endif() - LIST(APPEND INC ${WINTAB_INC}) + list(APPEND INC ${WINTAB_INC}) - LIST(APPEND SRC + list(APPEND SRC intern/GHOST_DisplayManagerWin32.cpp intern/GHOST_SystemWin32.cpp intern/GHOST_WindowWin32.cpp @@ -142,7 +142,7 @@ ELSEIF(WIN32) intern/GHOST_SystemWin32.h intern/GHOST_WindowWin32.h ) -ENDIF(APPLE) +endif() -BLENDERLIB(bf_intern_ghost "${SRC}" "${INC}") +blenderlib(bf_intern_ghost "${SRC}" "${INC}") diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt index a095f050659..4ae0b17575b 100644 --- a/intern/guardedalloc/CMakeLists.txt +++ b/intern/guardedalloc/CMakeLists.txt @@ -24,29 +24,29 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC .) +set(INC .) -SET(SRC +set(SRC ./intern/mallocn.c BLO_sys_types.h MEM_guardedalloc.h ) -IF(WIN32 AND NOT UNIX) - LIST(APPEND SRC +if(WIN32 AND NOT UNIX) + list(APPEND SRC intern/mmap_win.c mmap_win.h ) -ENDIF(WIN32 AND NOT UNIX) +endif() -BLENDERLIB(bf_intern_guardedalloc "${SRC}" "${INC}") +blenderlib(bf_intern_guardedalloc "${SRC}" "${INC}") # Override C++ alloc, optional. -IF(WITH_CXX_GUARDEDALLOC) - SET(SRC +if(WITH_CXX_GUARDEDALLOC) + set(SRC cpp/mallocn.cpp ) - BLENDERLIB(bf_intern_guardedalloc_cpp "${SRC}" "${INC}") -ENDIF(WITH_CXX_GUARDEDALLOC) + blenderlib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}") +endif() diff --git a/intern/iksolver/CMakeLists.txt b/intern/iksolver/CMakeLists.txt index 94adf8c19df..e2cd389e849 100644 --- a/intern/iksolver/CMakeLists.txt +++ b/intern/iksolver/CMakeLists.txt @@ -24,13 +24,13 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC intern ../memutil ../moto/include ) -SET(SRC +set(SRC intern/IK_QJacobian.cpp intern/IK_QJacobianSolver.cpp intern/IK_QSegment.cpp @@ -70,4 +70,4 @@ SET(SRC intern/TNT/version.h ) -BLENDERLIB(bf_intern_ik "${SRC}" "${INC}") +blenderlib(bf_intern_ik "${SRC}" "${INC}") diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt index b3e49cca274..3a42cd4a64f 100644 --- a/intern/itasc/CMakeLists.txt +++ b/intern/itasc/CMakeLists.txt @@ -24,11 +24,11 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC ../../extern/Eigen2 ) -SET(SRC +set(SRC Armature.cpp Cache.cpp ConstraintSet.cpp @@ -222,4 +222,4 @@ SET(SRC ../../extern/Eigen2/Eigen/src/Sparse/UmfPackSupport.h ) -BLENDERLIB(bf_intern_itasc "${SRC}" "${INC}") +blenderlib(bf_intern_itasc "${SRC}" "${INC}") diff --git a/intern/memutil/CMakeLists.txt b/intern/memutil/CMakeLists.txt index 79a38a75304..03b9192f71a 100644 --- a/intern/memutil/CMakeLists.txt +++ b/intern/memutil/CMakeLists.txt @@ -24,12 +24,12 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . .. ) -SET(SRC +set(SRC intern/MEM_CacheLimiterC-Api.cpp intern/MEM_RefCountedC-Api.cpp @@ -43,4 +43,4 @@ SET(SRC MEM_SmartPtr.h ) -BLENDERLIB(bf_intern_memutil "${SRC}" "${INC}") +blenderlib(bf_intern_memutil "${SRC}" "${INC}") diff --git a/intern/moto/CMakeLists.txt b/intern/moto/CMakeLists.txt index 57baa5dfbb3..54d59e4e32d 100644 --- a/intern/moto/CMakeLists.txt +++ b/intern/moto/CMakeLists.txt @@ -24,11 +24,11 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC include ) -SET(SRC +set(SRC intern/MT_Assert.cpp intern/MT_CmMatrix4x4.cpp intern/MT_Matrix3x3.cpp @@ -67,4 +67,4 @@ SET(SRC include/NM_Scalar.h ) -BLENDERLIB(bf_intern_moto "${SRC}" "${INC}") +blenderlib(bf_intern_moto "${SRC}" "${INC}") diff --git a/intern/opennl/CMakeLists.txt b/intern/opennl/CMakeLists.txt index 46a22650f4b..b7253a241fe 100644 --- a/intern/opennl/CMakeLists.txt +++ b/intern/opennl/CMakeLists.txt @@ -25,14 +25,14 @@ # ***** END GPL LICENSE BLOCK ***** # External project, better not fix warnings. -REMOVE_STRICT_FLAGS() +remove_strict_flags() -SET(INC +set(INC extern superlu ) -SET(SRC +set(SRC intern/opennl.c superlu/colamd.c superlu/get_perm_c.c @@ -75,4 +75,4 @@ SET(SRC superlu/util.h ) -BLENDERLIB(bf_intern_opennl "${SRC}" "${INC}") +blenderlib(bf_intern_opennl "${SRC}" "${INC}") diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt index 1944ee51054..3505cd2c05d 100644 --- a/intern/smoke/CMakeLists.txt +++ b/intern/smoke/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC intern ../memutil ../../extern/bullet2/src @@ -32,7 +32,7 @@ SET(INC ${ZLIB_INC} ) -SET(SRC +set(SRC intern/EIGENVALUE_HELPER.cpp intern/FLUID_3D.cpp intern/FLUID_3D_SOLVERS.cpp @@ -80,14 +80,14 @@ SET(SRC intern/tnt/tnt_version.h ) -IF(WITH_OPENMP) - ADD_DEFINITIONS(-DPARALLEL=1) -ENDIF(WITH_OPENMP) +if(WITH_OPENMP) + add_definitions(-DPARALLEL=1) +endif() -IF(WITH_FFTW3) - ADD_DEFINITIONS(-DFFTW3=1) - LIST(APPEND INC ${FFTW3_INC}) -ENDIF(WITH_FFTW3) +if(WITH_FFTW3) + add_definitions(-DFFTW3=1) + list(APPEND INC ${FFTW3_INC}) +endif() -BLENDERLIB(bf_intern_smoke "${SRC}" "${INC}") +blenderlib(bf_intern_smoke "${SRC}" "${INC}") diff --git a/intern/string/CMakeLists.txt b/intern/string/CMakeLists.txt index b7bb8d9c106..5aef036e55a 100644 --- a/intern/string/CMakeLists.txt +++ b/intern/string/CMakeLists.txt @@ -24,15 +24,15 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . ) -SET(SRC +set(SRC intern/STR_String.cpp STR_HashedString.h STR_String.h ) -BLENDERLIB(bf_intern_string "${SRC}" "${INC}") +blenderlib(bf_intern_string "${SRC}" "${INC}") |