diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-31 05:15:44 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-31 05:15:44 +0400 |
commit | 09da9d43931a09e3786343e724a3de7217285d0d (patch) | |
tree | 4c48fbd4404687fd04254d071d535499a1ae4058 /intern | |
parent | dcd55cef86270f076cf827c5ae7a6cc76db4f9ad (diff) |
cmake maintenance
blender_add_lib now takes a separate include argument to suppress warnings in system includes (mostly ffmpeg & python).
also only build wm_apple.c on apple+carbon configuration.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/audaspace/CMakeLists.txt | 61 | ||||
-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 | 9 | ||||
-rw-r--r-- | intern/ghost/CMakeLists.txt | 11 | ||||
-rw-r--r-- | intern/guardedalloc/CMakeLists.txt | 12 | ||||
-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/mikktspace/CMakeLists.txt | 6 | ||||
-rw-r--r-- | intern/moto/CMakeLists.txt | 6 | ||||
-rw-r--r-- | intern/opennl/CMakeLists.txt | 6 | ||||
-rw-r--r-- | intern/smoke/CMakeLists.txt | 5 | ||||
-rw-r--r-- | intern/string/CMakeLists.txt | 6 |
16 files changed, 111 insertions, 53 deletions
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index a2468d0071e..0aac2612886 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -23,12 +23,15 @@ set(INC . intern - FX SRC - ${PTHREADS_INC} - ${LIBSAMPLERATE_INC} + FX + SRC ../ffmpeg ) +set(INC_SYS + ${PTHREADS_INC} +) + set(SRC FX/AUD_AccumulatorFactory.cpp FX/AUD_BaseIIRFilterReader.cpp @@ -156,8 +159,9 @@ set(SRC if(WITH_CODEC_FFMPEG) add_definitions(-DWITH_FFMPEG) - list(APPEND INC ffmpeg ${FFMPEG_INC}) - set(FFMPEGSRC + list(APPEND INC ffmpeg) + list(APPEND INC_SYS ${FFMPEG_INC}) + list(APPEND SRC ffmpeg/AUD_FFMPEGFactory.cpp ffmpeg/AUD_FFMPEGReader.cpp @@ -168,8 +172,9 @@ endif() if(WITH_SDL) add_definitions(-DWITH_SDL) - list(APPEND INC SDL ${SDL_INCLUDE_DIR}) - set(SDLSRC + list(APPEND INC SDL) + list(APPEND INC_SYS ${SDL_INCLUDE_DIR}) + list(APPEND SRC SDL/AUD_SDLDevice.cpp SDL/AUD_SDLDevice.h @@ -178,18 +183,20 @@ endif() if(WITH_OPENAL) add_definitions(-DWITH_OPENAL) - list(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR}) - set(OPENALSRC + list(APPEND INC OpenAL) + list(APPEND INC_SYS ${OPENAL_INCLUDE_DIR}) + list(APPEND SRC OpenAL/AUD_OpenALDevice.cpp OpenAL/AUD_OpenALDevice.h - ) + ) endif() if(WITH_JACK) add_definitions(-DWITH_JACK) - list(APPEND INC jack ${JACK_INC}) - set(JACKSRC + list(APPEND INC jack) + list(APPEND INC_SYS ${JACK_INC}) + list(APPEND SRC jack/AUD_JackDevice.cpp jack/AUD_JackDevice.h @@ -198,7 +205,8 @@ endif() if(WITH_CODEC_SNDFILE) add_definitions(-DWITH_SNDFILE) - list(APPEND INC sndfile ${SNDFILE_INC}) + list(APPEND INC sndfile) + list(APPEND INC_SYS ${SNDFILE_INC}) set(SNDFILESRC sndfile/AUD_SndFileFactory.cpp sndfile/AUD_SndFileReader.cpp @@ -210,7 +218,8 @@ endif() if(WITH_SAMPLERATE) add_definitions(-DWITH_SAMPLERATE) - set(SRCFILESRC + list(APPEND INC_SYS ${LIBSAMPLERATE_INC}) + list(APPEND SRC SRC/AUD_SRCResampleFactory.cpp SRC/AUD_SRCResampleReader.cpp @@ -221,8 +230,9 @@ endif() if(WITH_FFTW3 AND FALSE) add_definitions(-DWITH_FFTW3) - list(APPEND INC fftw ${FFTW3_INC}) - set(FFTW3SRC + list(APPEND INC fftw) + list(APPEND INC_SYS ${FFTW3_INC}) + list(APPEND SRC fftw/AUD_BandPassFactory.cpp fftw/AUD_BandPassReader.cpp @@ -232,8 +242,9 @@ if(WITH_FFTW3 AND FALSE) endif() if(WITH_PYTHON) - list(APPEND INC Python ${PYTHON_INCLUDE_DIRS}) - set(PYTHONSRC + list(APPEND INC Python) + list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS}) + list(APPEND SRC Python/AUD_PyAPI.cpp Python/AUD_PyAPI.h @@ -241,16 +252,4 @@ if(WITH_PYTHON) add_definitions(-DWITH_PYTHON) endif() -set(SRC - ${SRC} - ${FFMPEGSRC} - ${SNDFILESRC} - ${SRCFILESRC} - ${FFTW3SRC} - ${SDLSRC} - ${OPENALSRC} - ${JACKSRC} - ${PYTHONSRC} -) - -blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}") +blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/boolop/CMakeLists.txt b/intern/boolop/CMakeLists.txt index 7e36f255268..7a95d556172 100644 --- a/intern/boolop/CMakeLists.txt +++ b/intern/boolop/CMakeLists.txt @@ -36,6 +36,10 @@ set(INC ../../source/blender/makesdna ) +set(INC_SYS + +) + set(SRC intern/BOP_BBox.cpp intern/BOP_BSPNode.cpp @@ -75,4 +79,4 @@ set(SRC intern/BOP_Vertex.h ) -blender_add_lib(bf_intern_bop "${SRC}" "${INC}") +blender_add_lib(bf_intern_bop "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/bsp/CMakeLists.txt b/intern/bsp/CMakeLists.txt index 9f281586867..792f6aa1327 100644 --- a/intern/bsp/CMakeLists.txt +++ b/intern/bsp/CMakeLists.txt @@ -32,6 +32,10 @@ set(INC ../memutil ) +set(INC_SYS + +) + set(SRC intern/BSP_CSGMesh.cpp intern/BSP_MeshPrimitives.cpp @@ -44,4 +48,4 @@ set(SRC intern/BSP_MeshPrimitives.h ) -blender_add_lib(bf_intern_bsp "${SRC}" "${INC}") +blender_add_lib(bf_intern_bsp "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/container/CMakeLists.txt b/intern/container/CMakeLists.txt index 7e83acf68ce..42c8de6a08e 100644 --- a/intern/container/CMakeLists.txt +++ b/intern/container/CMakeLists.txt @@ -29,6 +29,10 @@ set(INC ../guardedalloc ) +set(INC_SYS + +) + set(SRC intern/CTR_List.cpp @@ -40,4 +44,4 @@ set(SRC CTR_UHeap.h ) -blender_add_lib(bf_intern_ctr "${SRC}" "${INC}") +blender_add_lib(bf_intern_ctr "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/decimation/CMakeLists.txt b/intern/decimation/CMakeLists.txt index 6f9137b7189..53ba92e416b 100644 --- a/intern/decimation/CMakeLists.txt +++ b/intern/decimation/CMakeLists.txt @@ -32,6 +32,10 @@ set(INC ../moto/include ) +set(INC_SYS + +) + set(SRC intern/LOD_EdgeCollapser.cpp intern/LOD_ExternNormalEditor.cpp @@ -57,4 +61,4 @@ set(SRC intern/LOD_QuadricEditor.h ) -blender_add_lib(bf_intern_decimate "${SRC}" "${INC}") +blender_add_lib(bf_intern_decimate "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index dd23e854a25..7a842a29b98 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -26,6 +26,9 @@ set(INC extern +) + +set(INC_SYS ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} ) @@ -88,11 +91,11 @@ set(SRC add_definitions(-DNOGUI -DELBEEM_BLENDER=1) if(WINDOWS) - add_definitions(-DUSE_MSVC6FIXES) + add_definitions(-DUSE_MSVC6FIXES) endif() if(WITH_OPENMP) - add_definitions(-DPARALLEL=1) + add_definitions(-DPARALLEL=1) endif() -blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}") +blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index d42be400dff..065aa68dd3d 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -29,6 +29,9 @@ set(INC ../string ../../source/blender/imbuf ../../source/blender/makesdna +) + +set(INC_SYS ${GLEW_INCLUDE_PATH} ) @@ -123,7 +126,7 @@ elseif(UNIX) add_definitions(-DWITH_X11_XINPUT) endif() - list(APPEND INC ${X11_X11_INCLUDE_PATH}) + list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH}) list(APPEND SRC intern/GHOST_DisplayManagerX11.cpp @@ -143,7 +146,7 @@ elseif(UNIX) if(X11_XF86keysym_INCLUDE_PATH) add_definitions(-DWITH_XF86KEYSYM) - list(APPEND INC ${X11_XF86keysym_INCLUDE_PATH}) + list(APPEND INC_SYS ${X11_XF86keysym_INCLUDE_PATH}) endif() elseif(WIN32) @@ -151,7 +154,7 @@ elseif(WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") endif() - list(APPEND INC ${WINTAB_INC}) + list(APPEND INC_SYS ${WINTAB_INC}) list(APPEND SRC intern/GHOST_DisplayManagerWin32.cpp @@ -169,5 +172,5 @@ elseif(WIN32) ) endif() -blender_add_lib(bf_intern_ghost "${SRC}" "${INC}") +blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt index 4a534d94eb8..b3fe29af570 100644 --- a/intern/guardedalloc/CMakeLists.txt +++ b/intern/guardedalloc/CMakeLists.txt @@ -24,7 +24,13 @@ # # ***** END GPL LICENSE BLOCK ***** -set(INC .) +set(INC + . +) + +set(INC_SYS + +) set(SRC ./intern/mallocn.c @@ -41,12 +47,12 @@ if(WIN32 AND NOT UNIX) ) endif() -blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}") +blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}" "${INC_SYS}") # Override C++ alloc, optional. if(WITH_CXX_GUARDEDALLOC) set(SRC cpp/mallocn.cpp ) - blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}") + blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}" "${INC_SYS}") endif() diff --git a/intern/iksolver/CMakeLists.txt b/intern/iksolver/CMakeLists.txt index 46be310b7ec..5a7c0978599 100644 --- a/intern/iksolver/CMakeLists.txt +++ b/intern/iksolver/CMakeLists.txt @@ -30,6 +30,10 @@ set(INC ../moto/include ) +set(INC_SYS + +) + set(SRC intern/IK_QJacobian.cpp intern/IK_QJacobianSolver.cpp @@ -70,4 +74,4 @@ set(SRC intern/TNT/version.h ) -blender_add_lib(bf_intern_ik "${SRC}" "${INC}") +blender_add_lib(bf_intern_ik "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt index a0489c48144..26b61f5c6ce 100644 --- a/intern/itasc/CMakeLists.txt +++ b/intern/itasc/CMakeLists.txt @@ -28,6 +28,10 @@ set(INC ../../extern/Eigen2 ) +set(INC_SYS + +) + set(SRC Armature.cpp Cache.cpp @@ -222,4 +226,4 @@ set(SRC ../../extern/Eigen2/Eigen/src/Sparse/UmfPackSupport.h ) -blender_add_lib(bf_intern_itasc "${SRC}" "${INC}") +blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/memutil/CMakeLists.txt b/intern/memutil/CMakeLists.txt index aecd3d5b6c9..54e43cb7236 100644 --- a/intern/memutil/CMakeLists.txt +++ b/intern/memutil/CMakeLists.txt @@ -29,6 +29,10 @@ set(INC .. ) +set(INC_SYS + +) + set(SRC intern/MEM_CacheLimiterC-Api.cpp intern/MEM_RefCountedC-Api.cpp @@ -43,4 +47,4 @@ set(SRC MEM_SmartPtr.h ) -blender_add_lib(bf_intern_memutil "${SRC}" "${INC}") +blender_add_lib(bf_intern_memutil "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/mikktspace/CMakeLists.txt b/intern/mikktspace/CMakeLists.txt index f84a499206c..b6552b18e37 100644 --- a/intern/mikktspace/CMakeLists.txt +++ b/intern/mikktspace/CMakeLists.txt @@ -28,11 +28,15 @@ set(INC . ) +set(INC_SYS + +) + set(SRC mikktspace.c mikktspace.h ) -blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}") +blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/moto/CMakeLists.txt b/intern/moto/CMakeLists.txt index b9fd8986268..1e73f960907 100644 --- a/intern/moto/CMakeLists.txt +++ b/intern/moto/CMakeLists.txt @@ -28,6 +28,10 @@ set(INC include ) +set(INC_SYS + +) + set(SRC intern/MT_Assert.cpp intern/MT_CmMatrix4x4.cpp @@ -67,4 +71,4 @@ set(SRC include/NM_Scalar.h ) -blender_add_lib(bf_intern_moto "${SRC}" "${INC}") +blender_add_lib(bf_intern_moto "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/opennl/CMakeLists.txt b/intern/opennl/CMakeLists.txt index 699d2dec795..55b0bc5855f 100644 --- a/intern/opennl/CMakeLists.txt +++ b/intern/opennl/CMakeLists.txt @@ -36,6 +36,10 @@ set(INC superlu ) +set(INC_SYS + +) + set(SRC intern/opennl.c superlu/colamd.c @@ -79,4 +83,4 @@ set(SRC superlu/util.h ) -blender_add_lib(bf_intern_opennl "${SRC}" "${INC}") +blender_add_lib(bf_intern_opennl "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt index 486ef92f638..c787f54b284 100644 --- a/intern/smoke/CMakeLists.txt +++ b/intern/smoke/CMakeLists.txt @@ -28,6 +28,9 @@ set(INC intern ../memutil ../../extern/bullet2/src +) + +set(INC_SYS ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} ) @@ -89,5 +92,5 @@ if(WITH_FFTW3) list(APPEND INC ${FFTW3_INC}) endif() -blender_add_lib(bf_intern_smoke "${SRC}" "${INC}") +blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/string/CMakeLists.txt b/intern/string/CMakeLists.txt index 60796185e70..28bd198d29f 100644 --- a/intern/string/CMakeLists.txt +++ b/intern/string/CMakeLists.txt @@ -28,6 +28,10 @@ set(INC . ) +set(INC_SYS + +) + set(SRC intern/STR_String.cpp @@ -35,4 +39,4 @@ set(SRC STR_String.h ) -blender_add_lib(bf_intern_string "${SRC}" "${INC}") +blender_add_lib(bf_intern_string "${SRC}" "${INC}" "${INC_SYS}") |