cmake maintenance
authorCampbell Barton <ideasman42@gmail.com>
Tue, 31 May 2011 01:15:44 +0000 (01:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 31 May 2011 01:15:44 +0000 (01:15 +0000)
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.

102 files changed:
build_files/cmake/macros.cmake
extern/binreloc/CMakeLists.txt
extern/bullet2/CMakeLists.txt
extern/glew/CMakeLists.txt
extern/libopenjpeg/CMakeLists.txt
extern/libredcode/CMakeLists.txt
extern/lzma/CMakeLists.txt
extern/lzo/CMakeLists.txt
intern/audaspace/CMakeLists.txt
intern/boolop/CMakeLists.txt
intern/bsp/CMakeLists.txt
intern/container/CMakeLists.txt
intern/decimation/CMakeLists.txt
intern/elbeem/CMakeLists.txt
intern/ghost/CMakeLists.txt
intern/guardedalloc/CMakeLists.txt
intern/iksolver/CMakeLists.txt
intern/itasc/CMakeLists.txt
intern/memutil/CMakeLists.txt
intern/mikktspace/CMakeLists.txt
intern/moto/CMakeLists.txt
intern/opennl/CMakeLists.txt
intern/smoke/CMakeLists.txt
intern/string/CMakeLists.txt
source/blender/avi/CMakeLists.txt
source/blender/blenfont/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/CMakeLists.txt
source/blender/blenpluginapi/CMakeLists.txt
source/blender/collada/CMakeLists.txt
source/blender/editors/animation/CMakeLists.txt
source/blender/editors/armature/CMakeLists.txt
source/blender/editors/curve/CMakeLists.txt
source/blender/editors/datafiles/CMakeLists.txt
source/blender/editors/gpencil/CMakeLists.txt
source/blender/editors/interface/CMakeLists.txt
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/metaball/CMakeLists.txt
source/blender/editors/object/CMakeLists.txt
source/blender/editors/physics/CMakeLists.txt
source/blender/editors/render/CMakeLists.txt
source/blender/editors/screen/CMakeLists.txt
source/blender/editors/sculpt_paint/CMakeLists.txt
source/blender/editors/sound/CMakeLists.txt
source/blender/editors/space_action/CMakeLists.txt
source/blender/editors/space_api/CMakeLists.txt
source/blender/editors/space_buttons/CMakeLists.txt
source/blender/editors/space_console/CMakeLists.txt
source/blender/editors/space_file/CMakeLists.txt
source/blender/editors/space_graph/CMakeLists.txt
source/blender/editors/space_image/CMakeLists.txt
source/blender/editors/space_info/CMakeLists.txt
source/blender/editors/space_logic/CMakeLists.txt
source/blender/editors/space_nla/CMakeLists.txt
source/blender/editors/space_node/CMakeLists.txt
source/blender/editors/space_outliner/CMakeLists.txt
source/blender/editors/space_script/CMakeLists.txt
source/blender/editors/space_sequencer/CMakeLists.txt
source/blender/editors/space_sound/CMakeLists.txt
source/blender/editors/space_text/CMakeLists.txt
source/blender/editors/space_time/CMakeLists.txt
source/blender/editors/space_userpref/CMakeLists.txt
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/editors/transform/CMakeLists.txt
source/blender/editors/util/CMakeLists.txt
source/blender/editors/uvedit/CMakeLists.txt
source/blender/gpu/CMakeLists.txt
source/blender/ikplugin/CMakeLists.txt
source/blender/imbuf/CMakeLists.txt
source/blender/imbuf/intern/cineon/CMakeLists.txt
source/blender/imbuf/intern/dds/CMakeLists.txt
source/blender/imbuf/intern/openexr/CMakeLists.txt
source/blender/makesdna/intern/CMakeLists.txt
source/blender/makesrna/intern/CMakeLists.txt
source/blender/modifiers/CMakeLists.txt
source/blender/nodes/CMakeLists.txt
source/blender/python/generic/CMakeLists.txt
source/blender/python/intern/CMakeLists.txt
source/blender/quicktime/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/SConscript
source/blender/windowmanager/intern/wm_apple.c
source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
source/gameengine/BlenderRoutines/CMakeLists.txt
source/gameengine/Converter/CMakeLists.txt
source/gameengine/Expressions/CMakeLists.txt
source/gameengine/GameLogic/CMakeLists.txt
source/gameengine/GamePlayer/common/CMakeLists.txt
source/gameengine/GamePlayer/ghost/CMakeLists.txt
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
source/gameengine/Network/CMakeLists.txt
source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
source/gameengine/Physics/Bullet/CMakeLists.txt
source/gameengine/Physics/Dummy/CMakeLists.txt
source/gameengine/Physics/common/CMakeLists.txt
source/gameengine/Rasterizer/CMakeLists.txt
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
source/gameengine/SceneGraph/CMakeLists.txt
source/gameengine/VideoTexture/CMakeLists.txt

index 6e4aaa51a4959a568010f689372edde5be30df06..265d507220549bd61be3c41c183fc53bd2ca595c 100644 (file)
@@ -13,6 +13,15 @@ macro(blender_include_dirs
        include_directories(${all_incs})
 endmacro()
 
+macro(blender_include_dirs_sys
+       includes)
+
+       foreach(inc ${ARGV})
+               get_filename_component(abs_inc ${inc} ABSOLUTE)
+               list(APPEND all_incs ${abs_inc})
+       endforeach()
+       include_directories(SYSTEM ${all_incs})
+endmacro()
 
 macro(blender_source_group
        sources)
@@ -35,12 +44,15 @@ endmacro()
 macro(blender_add_lib_nolist
        name
        sources
-       includes)
+       includes
+       includes_sys)
 
        # message(STATUS "Configuring library ${name}")
 
        # include_directories(${includes})
+       # include_directories(SYSTEM ${includes_sys})
        blender_include_dirs("${includes}")
+       blender_include_dirs_sys("${includes_sys}")
 
        add_library(${name} ${sources})
 
@@ -54,9 +66,10 @@ endmacro()
 macro(blender_add_lib
        name
        sources
-       includes)
+       includes
+       includes_sys)
 
-       blender_add_lib_nolist(${name} "${sources}" "${includes}")
+       blender_add_lib_nolist(${name} "${sources}" "${includes}" "${includes_sys}")
 
        set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
 endmacro()
index e3f0b05d563d0831798ec5cf2b61eb7b438519b7..a4f85a2fdfde25656172456994405827275b976a 100644 (file)
 # All rights reserved.
 #
 
+set(INC
+       ./include
+)
+
+set(INC_SYS
+
+)
+
 set(SRC
        binreloc.c
 
        include/binreloc.h
 )
 
-set(INC
-       ./include
-)
-
 add_definitions(-DENABLE_BINRELOC)
 
 
-blender_add_lib(extern_binreloc "${SRC}" "${INC}")
+blender_add_lib(extern_binreloc "${SRC}" "${INC}" "${INC_SYS}")
index a9137dd33f7386476c47b11a64a0a4b05fe5f629..bfc4b31689e6e38a856acc7d504b436c1c918d87 100644 (file)
@@ -29,6 +29,10 @@ set(INC
        src
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
        src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp
@@ -145,7 +149,6 @@ set(SRC
        src/LinearMath/btGeometryUtil.cpp
        src/LinearMath/btQuickprof.cpp
        src/LinearMath/btSerializer.cpp
-       
 
        src/Bullet-C-Api.h
        src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
@@ -330,4 +333,4 @@ if(CMAKE_COMPILER_IS_GNUCXX)
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 endif()
 
-blender_add_lib(extern_bullet "${SRC}" "${INC}")
+blender_add_lib(extern_bullet "${SRC}" "${INC}" "${INC_SYS}")
index 1a20dbdb9d7a217aa193c924e4c8ae5c0eedb299..35beacab6a335e3f50832ba246b25f223b2ab201 100644 (file)
@@ -28,8 +28,12 @@ set(INC
        ./include
 )
 
+set(INC_SYS
+
+)
+
 if(UNIX)
-       list(APPEND INC ${X11_X11_INCLUDE_PATH})
+       list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH})
 endif()
 
 set(SRC
@@ -42,4 +46,4 @@ set(SRC
 
 add_definitions(-DGLEW_STATIC)
 
-blender_add_lib(extern_glew "${SRC}" "${INC}")
+blender_add_lib(extern_glew "${SRC}" "${INC}" "${INC_SYS}")
index c5ba1363246cd59fac110130cf162a9ad0bbf30f..fe03db830540272a9a9c0065674281a9ed9f5f1d 100644 (file)
@@ -28,6 +28,10 @@ set(INC
        .
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        bio.c
        cio.c
@@ -73,4 +77,4 @@ set(SRC
        tgt.h
 )
 
-blender_add_lib(extern_openjpeg "${SRC}" "${INC}")
+blender_add_lib(extern_openjpeg "${SRC}" "${INC}" "${INC_SYS}")
index 20ad6ae9f7d94faba1820dd9f00d21997b21fd8e..1c4daac42d16e3b63ea4dfbd2eb105cb74d79d1d 100644 (file)
@@ -26,6 +26,9 @@
 
 set(INC
        .
+)
+
+set(INC_SYS
        ../libopenjpeg
 )
 
@@ -39,4 +42,4 @@ set(SRC
        format.h
 )
 
-blender_add_lib(extern_redcode "${SRC}" "${INC}")
+blender_add_lib(extern_redcode "${SRC}" "${INC}" "${INC_SYS}")
index 710165d249616b5d7e829b140b686e76bb5ae42e..bfb52591e08670d950be75c2619075a67f8d9148 100644 (file)
@@ -28,6 +28,10 @@ set(INC
        .
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        Alloc.c
        LzFind.c
@@ -44,4 +48,4 @@ set(SRC
        Types.h
 )
 
-blender_add_lib(extern_lzma "${SRC}" "${INC}")
+blender_add_lib(extern_lzma "${SRC}" "${INC}" "${INC_SYS}")
index 17728aad43e30b8e6d09764b2d2ccc5bd5e020a1..10ea2c58f7c3df2761769e29f0f10be16f6e0ca1 100644 (file)
@@ -28,6 +28,10 @@ set(INC
        include
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        minilzo/minilzo.c
 
@@ -36,4 +40,4 @@ set(SRC
        minilzo/minilzo.h
 )
 
-blender_add_lib(extern_minilzo "${SRC}" "${INC}")
+blender_add_lib(extern_minilzo "${SRC}" "${INC}" "${INC_SYS}")
index a2468d0071e6dbf88b777f62317e973d063c7597..0aac2612886749bfa4356d56696a2ad3312b0fc8 100644 (file)
 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}")
index 7e36f255268cd7796eb2793e0ba8bb466e9a4260..7a95d5561723a9ffb1247c2c765b85a569bb1b33 100644 (file)
@@ -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}")
index 9f281586867a47181f665e2cb004017e1da0bffc..792f6aa1327fa6a21df58771e09f4ad17919ac76 100644 (file)
@@ -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}")
index 7e83acf68cec4f2cbb3990ededdd82c40cebfb2e..42c8de6a08e892e461505d3e2a40baab098eff7e 100644 (file)
@@ -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}")
index 6f9137b7189520b5ee2d5eb2da92d61117442675..53ba92e416b8f3e2995268348f277a8af6e92e5d 100644 (file)
@@ -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}")
index dd23e854a2573a1876587b10274fe982270182df..7a842a29b98b621b7f89125eb0145d9e6c2601ef 100644 (file)
@@ -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}")
index d42be400dff511991c2cfba9c0b0a3aa6188e993..065aa68dd3d242f81b6db9869e2f91da8d4b54ce 100644 (file)
@@ -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}")
 
index 4a534d94eb8af1e42fdf2258ecd9bdd985502bd7..b3fe29af570469f41b4a93999d37fc67e6eee5fd 100644 (file)
 #
 # ***** 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()
index 46be310b7ec0b640e521466803090985a0acce6b..5a7c0978599e39be98c7adea078864145ecfd265 100644 (file)
@@ -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}")
index a0489c481449baa348b264103c163793a5c1a6df..26b61f5c6ce41bb5dbfe2c8f50ff9cc0b99a5588 100644 (file)
@@ -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}")
index aecd3d5b6c91931c40af0a2f697a4bc2560a4dbc..54e43cb723626e8794733c98c04341eb221452dc 100644 (file)
@@ -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}")
index f84a499206cf8d258796b193c14a4c08c7a4b850..b6552b18e3760b0110d09e4bc545414138ece548 100644 (file)
@@ -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}")
 
index b9fd898626895a8366fd9588b7215ce198aed6ae..1e73f960907208d623534e53f3d83b1ac2a49642 100644 (file)
@@ -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}")
index 699d2dec795571d724d1a43121e39300074278c5..55b0bc5855fa7b94b87a4395b4e75cf5f318350a 100644 (file)
@@ -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}")
index 486ef92f6381b1d2051648013bd6102ecaaf6960..c787f54b284ffba1ce0aa415e1c17d829798324d 100644 (file)
@@ -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}")
 
index 60796185e7061692702c426d06012175feaa84f8..28bd198d29f020232201fd0f7918c2523a9ca0ee 100644 (file)
@@ -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}")
index 77a43e5560e2a42e41f29b8b57690b519333f541..b62e0cc5afd6b95e86c58d65269b224a4dded621 100644 (file)
@@ -27,6 +27,9 @@
 set(INC 
        .
        ../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${JPEG_INCLUDE_DIR}
 )
 
@@ -47,4 +50,4 @@ set(SRC
        intern/rgb32.h
 )
 
-blender_add_lib(bf_avi "${SRC}" "${INC}")
+blender_add_lib(bf_avi "${SRC}" "${INC}" "${INC_SYS}")
index 48ee4aed0337bf38937bf4310323ee5221301282..b915764c1bb1bb6320d66b1b403a9242fb2f6b93 100644 (file)
@@ -29,6 +29,9 @@ set(INC
        ../editors/include
        ../blenkernel
        ../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
        ${FREETYPE_INCLUDE_DIRS}
 )
@@ -47,7 +50,7 @@ set(SRC
 )
 
 if(WITH_INTERNATIONAL)
-       list(APPEND INC ${GETTEXT_INC})
+       list(APPEND INC_SYS ${GETTEXT_INC})
        add_definitions(-DINTERNATIONAL)
 endif()
 
@@ -55,5 +58,5 @@ if(WIN32 AND NOT UNIX)
        add_definitions(-DUSE_GETTEXT_DLL)
 endif()
 
-blender_add_lib(bf_blenfont "${SRC}" "${INC}")
+blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}")
 
index 44d20b6c651038897988f3b9580fa935134b4161..5078657588dc40ff36f0b975c68f5fc7d3c0c13b 100644 (file)
@@ -55,6 +55,9 @@ set(INC
        ../../../intern/smoke/extern
        ../../../intern/mikktspace
        ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
        ${ZLIB_INCLUDE_DIRS}
 )
@@ -269,17 +272,19 @@ if(WITH_IMAGE_HDR)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC ../quicktime ${QUICKTIME_INC})
+       list(APPEND INC ../quicktime)
+       list(APPEND INC_SYS ${QUICKTIME_INC})
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-       list(APPEND INC ${FFMPEG_INC})
+       list(APPEND INC_SYS ${FFMPEG_INC})
        add_definitions(-DWITH_FFMPEG)
 endif()
 
 if(WITH_PYTHON)
-       list(APPEND INC ../python ${PYTHON_INCLUDE_DIRS})
+       list(APPEND INC ../python)
+       list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
        add_definitions(-DWITH_PYTHON)
 
        if(WITH_PYTHON_SECURITY)
@@ -300,12 +305,12 @@ if(WITH_JACK)
 endif()
 
 if(WITH_LZO)
-       list(APPEND INC ../../../extern/lzo/minilzo)
+       list(APPEND INC_SYS ../../../extern/lzo/minilzo)
        add_definitions(-DWITH_LZO)
 endif()
 
 if(WITH_LZMA)
-       list(APPEND INC ../../../extern/lzma)
+       list(APPEND INC_SYS ../../../extern/lzma)
        add_definitions(-DWITH_LZMA)
 endif()
 
@@ -313,4 +318,4 @@ if(MSVC)
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
 endif()
 
-blender_add_lib(bf_blenkernel "${SRC}" "${INC}")
+blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}")
index b7827d628516477faa6760287d54b87ac900e911..0c25da325ad55f0878fc1dd0a6bf824a96ea26ec 100644 (file)
@@ -32,6 +32,9 @@ set(INC
        ../gpu
        ../../../intern/ghost
        ../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${ZLIB_INCLUDE_DIRS}
        ${FREETYPE_INCLUDE_DIRS}
 )
@@ -134,12 +137,12 @@ set(SRC
 )
 
 if(WITH_BINRELOC)
+       list(APPEND INC_SYS "${BINRELOC_INC}")
        add_definitions(-DWITH_BINRELOC)
-       list(APPEND INC "${BINRELOC_INC}")
 endif()
 
 if(WITH_OPENMP)
        add_definitions(-DPARALLEL=1)
 endif()
 
-blender_add_lib(bf_blenlib "${SRC}" "${INC}")
+blender_add_lib(bf_blenlib "${SRC}" "${INC}" "${INC_SYS}")
index 888cf3148e3b1a3b57a71f8b494ef8a16f4ff4ca..312a6546e22c6736a39bf09c224fad3054eeb39d 100644 (file)
@@ -32,6 +32,9 @@ set(INC
        ../makesrna
        ../render/extern/include
        ../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${ZLIB_INCLUDE_DIRS}
 )
 
@@ -55,4 +58,4 @@ if(WITH_BUILDINFO)
        add_definitions(-DNAN_BUILDINFO)
 endif()
 
-blender_add_lib(bf_blenloader "${SRC}" "${INC}")
+blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}")
index 1e3a3398861e5e204f2b764ade39ebdae17b2aca..c3aad25ccbeabdd9fe7f0a5670974ac509f9a186 100644 (file)
@@ -34,6 +34,10 @@ set(INC
        ../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        intern/pluginapi.c
 
@@ -46,8 +50,8 @@ set(SRC
 )
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC ${QUICKTIME_INC})
+       list(APPEND INC_SYS ${QUICKTIME_INC})
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
-blender_add_lib(bf_blenpluginapi "${SRC}" "${INC}")
+blender_add_lib(bf_blenpluginapi "${SRC}" "${INC}" "${INC_SYS}")
index fa7bfee8ee55405e9935fddc0aac4c1669bde540..a7e7c973f361e364c7d1d324a3adce19432ea10a 100644 (file)
@@ -38,8 +38,12 @@ set(INC
        ../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 if(APPLE)
-       list(APPEND INC
+       list(APPEND INC_SYS
                ${OPENCOLLADA_INC}/COLLADAStreamWriter
                ${OPENCOLLADA_INC}/COLLADABaseUtils
                ${OPENCOLLADA_INC}/COLLADAFramework
@@ -47,7 +51,7 @@ if(APPLE)
                ${OPENCOLLADA_INC}/GeneratedSaxParser 
        )
 else()
-       list(APPEND INC
+       list(APPEND INC_SYS
                ${OPENCOLLADA_INC}/COLLADAStreamWriter/include
                ${OPENCOLLADA_INC}/COLLADABaseUtils/include
                ${OPENCOLLADA_INC}/COLLADAFramework/include
@@ -111,4 +115,4 @@ if(CMAKE_COMPILER_IS_GNUCXX)
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 endif()
 
-blender_add_lib(bf_collada "${SRC}" "${INC}")
+blender_add_lib(bf_collada "${SRC}" "${INC}" "${INC_SYS}")
index 8fc1ec429cce8f0c4bf11e5db3d1d4c31389f3cf..a3c1d035d9b4bdb49117f7de9541e86234246e54 100644 (file)
@@ -28,6 +28,9 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -51,4 +54,4 @@ set(SRC
        anim_intern.h
 )
 
-blender_add_lib(bf_editor_animation "${SRC}" "${INC}")
+blender_add_lib(bf_editor_animation "${SRC}" "${INC}" "${INC_SYS}")
index 3234254f745a1692c843de27e1e5b331bc8663bb..2db6e2784604f560cdfba5f133d4b4c4fb0970f5 100644 (file)
@@ -29,6 +29,9 @@ set(INC
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/opennl/extern
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -52,4 +55,4 @@ set(SRC
        reeb.h
 )
 
-blender_add_lib(bf_editor_armature "${SRC}" "${INC}")
+blender_add_lib(bf_editor_armature "${SRC}" "${INC}" "${INC_SYS}")
index a73fb9502a67705c6df97316a283731e736f1e5b..dfc7e336e84fee5a182f6781f785bc5eb809c917 100644 (file)
@@ -30,6 +30,10 @@ set(INC
        ../../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        curve_ops.c
        editcurve.c
@@ -39,4 +43,4 @@ set(SRC
        curve_intern.h
 )
 
-blender_add_lib(bf_editor_curve "${SRC}" "${INC}")
+blender_add_lib(bf_editor_curve "${SRC}" "${INC}" "${INC_SYS}")
index a359b0ef6f5caac60d2f44569afdc355961e914c..8761297b979e55817a43b30688add6d5fe62069b 100644 (file)
 #
 # ***** END GPL LICENSE BLOCK *****
 
-set(INC "")
+set(INC
+
+)
+
+set(INC_SYS
+
+)
 
 set(SRC
        Bfont.c
@@ -60,4 +66,4 @@ set(SRC
        vertexdraw.png.c
 )
 
-blender_add_lib(bf_editor_datafiles "${SRC}" "${INC}")
+blender_add_lib(bf_editor_datafiles "${SRC}" "${INC}" "${INC_SYS}")
index 71199ee9580b1b511a5d74d776ee9def4a003862..352960d285a9ace070a040f4ff4d03348994bf58 100644 (file)
@@ -29,6 +29,9 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -43,4 +46,4 @@ set(SRC
        gpencil_intern.h
 )
 
-blender_add_lib(bf_editor_gpencil "${SRC}" "${INC}")
+blender_add_lib(bf_editor_gpencil "${SRC}" "${INC}" "${INC_SYS}")
index cf0c903e0a5fc6dcb692f9d6a82e005c526b4e04..9902cac8857145c5703813cd6a8d55f2cef43cae 100644 (file)
@@ -32,6 +32,9 @@ set(INC
        ../../python
        ../../windowmanager
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -64,4 +67,4 @@ if(WITH_PYTHON)
        add_definitions(-DWITH_PYTHON)
 endif()
 
-blender_add_lib(bf_editor_interface "${SRC}" "${INC}")
+blender_add_lib(bf_editor_interface "${SRC}" "${INC}" "${INC_SYS}")
index a03bf173425b01b1abe7515ba70278f6b9d10ddc..bd8789b9eeff291748818e2c949622d02681ca82 100644 (file)
@@ -30,6 +30,9 @@ set(INC
        ../../windowmanager
        ../../render/extern/include
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -49,4 +52,4 @@ set(SRC
        mesh_intern.h
 )
 
-blender_add_lib(bf_editor_mesh "${SRC}" "${INC}")
+blender_add_lib(bf_editor_mesh "${SRC}" "${INC}" "${INC_SYS}")
index af3d25699edb52efb6f4462db53568d81ad5a6bf..690a8ec2fcb99c79b783986b1cc237f11b86b961 100644 (file)
@@ -31,6 +31,10 @@ set(INC
        ../../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        mball_edit.c
        mball_ops.c
@@ -38,4 +42,4 @@ set(SRC
        mball_intern.h
 )
 
-blender_add_lib(bf_editor_metaball "${SRC}" "${INC}")
+blender_add_lib(bf_editor_metaball "${SRC}" "${INC}" "${INC_SYS}")
index 47cb4d009381747150f7d348cecf58643097aba9..4d50b78b7a1b8a579241110f7e3650f8a71405fb 100644 (file)
@@ -35,6 +35,10 @@ set(INC
        ../../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        object_add.c
        object_bake.c
@@ -58,4 +62,4 @@ if(WITH_PYTHON)
        add_definitions(-DWITH_PYTHON)
 endif()
 
-blender_add_lib(bf_editor_object "${SRC}" "${INC}")
+blender_add_lib(bf_editor_object "${SRC}" "${INC}" "${INC_SYS}")
index 8d51d6eec378e3139eec1eec730989b37faafefe..1badccffe3b8c5982b39c1ace47fe8e34aa1b567 100644 (file)
@@ -29,6 +29,9 @@ set(INC
        ../../windowmanager
        ../../../../intern/elbeem/extern
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -48,7 +51,7 @@ if(NOT WITH_MOD_FLUID)
 endif()
 
 if(WITH_OPENMP)
-               add_definitions(-DPARALLEL=1)
+       add_definitions(-DPARALLEL=1)
 endif()
 
-blender_add_lib(bf_editor_physics "${SRC}" "${INC}")
+blender_add_lib(bf_editor_physics "${SRC}" "${INC}" "${INC_SYS}")
index d04c75a2b48d74d104ca98d7386f3b2ba1113ca7..c3bb6f457a26c0acebab9febe6c340c5044cf6af 100644 (file)
@@ -32,6 +32,9 @@ set(INC
        ../../render/extern/include
        ../../windowmanager
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -48,7 +51,8 @@ set(SRC
 )
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC ../../quicktime ${QUICKTIME_INC})
+       list(APPEND INC ../../quicktime)
+       list(APPEND INC_SYS ${QUICKTIME_INC})
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
@@ -56,4 +60,4 @@ if(WITH_OPENMP)
        add_definitions(-DPARALLEL=1)
 endif()
 
-blender_add_lib(bf_editor_render "${SRC}" "${INC}")
+blender_add_lib(bf_editor_render "${SRC}" "${INC}" "${INC_SYS}")
index a583d7535144133e4a45b19018be5c9ee1370602..54341257692d6b5236fddd7eabd434398be9aedb 100644 (file)
@@ -30,6 +30,9 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -44,4 +47,4 @@ set(SRC
        screen_intern.h
 )
 
-blender_add_lib(bf_editor_screen "${SRC}" "${INC}")
+blender_add_lib(bf_editor_screen "${SRC}" "${INC}" "${INC_SYS}")
index 248b6ea2b94418cfe04bff72ea1eb407edb8fe08..6ecbc9c5eecdd02e9ac977522dbdfd794d5812d6 100644 (file)
@@ -31,6 +31,9 @@ set(INC
        ../../windowmanager
        ../../render/extern/include
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -48,4 +51,4 @@ set(SRC
        sculpt_intern.h
 )
 
-blender_add_lib(bf_editor_sculpt_paint "${SRC}" "${INC}")
+blender_add_lib(bf_editor_sculpt_paint "${SRC}" "${INC}" "${INC_SYS}")
index c2f7707309bddc851ec02978490f0b9fcf95a125..6a99971a5af7ce694e033e1f998878c7cb69bcc3 100644 (file)
@@ -31,10 +31,14 @@ set(INC
        ../../../../intern/audaspace/intern
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        sound_ops.c
 
        sound_intern.h
 )
 
-blender_add_lib(bf_editor_sound "${SRC}" "${INC}")
+blender_add_lib(bf_editor_sound "${SRC}" "${INC}" "${INC_SYS}")
index 7c52f4a9efb2def7cb9bf9bfc159a5ffa8c94b2b..6789556aa2b0a9be71861ae8e7e7c59997827c6c 100644 (file)
@@ -28,6 +28,9 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -41,4 +44,4 @@ set(SRC
        action_intern.h
 )
 
-blender_add_lib(bf_editor_space_action "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_action "${SRC}" "${INC}" "${INC_SYS}")
index 22319dbb26e148bab855cd17c0000f79ea48e805..c2dc2582c82e701f5238a71f4a3ba16e660319ca 100644 (file)
@@ -30,9 +30,13 @@ set(INC
        ../../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        space.c
        spacetypes.c
 )
 
-blender_add_lib(bf_editor_space_api "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_api "${SRC}" "${INC}" "${INC_SYS}")
index e9670949cd5634fe7a49c6a605a05aff695ae31c..0a4f251e46f4cb51b0ddfaedd8b4068c01db7c11 100644 (file)
@@ -28,6 +28,9 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -40,4 +43,4 @@ set(SRC
        buttons_intern.h
 )
 
-blender_add_lib(bf_editor_space_buttons "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_buttons "${SRC}" "${INC}" "${INC_SYS}")
index 14e7f4a90d06916a3ac7f550edc25efe4aeb83e6..f89d782c7f289f6595a33869f63e1ca8c3dfabaa 100644 (file)
@@ -29,6 +29,9 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -44,4 +47,4 @@ if(WITH_PYTHON)
        add_definitions(-DWITH_PYTHON)
 endif()
 
-blender_add_lib(bf_editor_space_console "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_console "${SRC}" "${INC}" "${INC_SYS}")
index 0a3bce764666a7c8390e6b10fa59e278b3f1fee1..e161e2d4b9bfd495b726afd9a84da4ccdf3e048d 100644 (file)
@@ -31,6 +31,9 @@ set(INC
        ../../windowmanager
        ../../render/extern/include
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -72,4 +75,4 @@ if(WITH_IMAGE_HDR)
        add_definitions(-DWITH_HDR)
 endif()
 
-blender_add_lib(bf_editor_space_file "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_file "${SRC}" "${INC}" "${INC_SYS}")
index 59f2b22516d58474cc691edaa97a7132f63fd987..f5548097db23803967a9ba8f6137b8e5ac85213b 100644 (file)
@@ -29,6 +29,9 @@ set(INC
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/audaspace/intern
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -44,4 +47,4 @@ set(SRC
        graph_intern.h
 )
 
-blender_add_lib(bf_editor_space_graph "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_graph "${SRC}" "${INC}" "${INC_SYS}")
index 286f1f3178bf3eabd61e33302ea62417c1122ed6..7c2d7ffb47bfb948dd3566f50caaa5b91e641ee3 100644 (file)
@@ -31,6 +31,9 @@ set(INC
        ../../windowmanager
        ../../render/extern/include
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -59,4 +62,4 @@ if(WITH_IMAGE_CINEON)
        add_definitions(-DWITH_CINEON)
 endif()
 
-blender_add_lib(bf_editor_space_image "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_image "${SRC}" "${INC}" "${INC_SYS}")
index 16f4b2dedff33376159172c26b42ad033414b815..c6ed1b7bac76cfb58cfc0a6711fd14048fb2e215 100644 (file)
@@ -30,6 +30,9 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -45,4 +48,4 @@ set(SRC
        textview.h
 )
 
-blender_add_lib(bf_editor_space_info "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_info "${SRC}" "${INC}" "${INC_SYS}")
index 6323ef779c2b45c5e4003f1c9e141f6a808317cb..cd24cb5e5d00fe9ecf1ff3ff866ee471ad19c58e 100644 (file)
@@ -29,6 +29,9 @@ set(INC
        ../../windowmanager
        ../../editors/interface
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -45,4 +48,4 @@ if(WITH_GAMEENGINE)
        add_definitions(-DWITH_GAMEENGINE)
 endif()
 
-blender_add_lib(bf_editor_space_logic "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_logic "${SRC}" "${INC}" "${INC_SYS}")
index 59ccb204d8cb02020aa6c6f53e339b5c0db6433c..1bf04f4dc376ec9a8050552b4d08a71168ae9ef6 100644 (file)
@@ -28,6 +28,9 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -43,4 +46,4 @@ set(SRC
        nla_intern.h
 )
 
-blender_add_lib(bf_editor_space_nla "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_nla "${SRC}" "${INC}" "${INC_SYS}")
index 8604ba3baed16d2ee3cd757895bee41df7d571ad..9172bc4e9eb34d8ac3f8ad3d9876495d1dd08f26 100644 (file)
@@ -33,6 +33,9 @@ set(INC
        ../../render/extern/include
        ../../../../intern/guardedalloc
        ../../../../intern/opennl/extern
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -50,4 +53,4 @@ set(SRC
        node_intern.h
 )
 
-blender_add_lib(bf_editor_space_node "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_node "${SRC}" "${INC}" "${INC_SYS}")
index 871dec4dfc5c0601f0b4bb92101109370b82ca8a..c05350c256fa43835c917c35c94bd1e8e749a73a 100644 (file)
@@ -30,6 +30,9 @@ set(INC
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/opennl/extern
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -41,4 +44,4 @@ set(SRC
        outliner_intern.h
 )
 
-blender_add_lib(bf_editor_space_outliner "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_outliner "${SRC}" "${INC}" "${INC_SYS}")
index 974dc66e22c15cd5147a4d817df724a97a1d53d8..1aed177eed1a289e67bd59b783781d03675acad4 100644 (file)
@@ -28,6 +28,9 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -41,8 +44,9 @@ set(SRC
 )
 
 if(WITH_PYTHON)
-       list(APPEND INC ${PYTHON_INCLUDE_DIRS} ../../python)
+       list(APPEND INC ../../python)
+       list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
        add_definitions(-DWITH_PYTHON)
 endif()
 
-blender_add_lib(bf_editor_space_script "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_script "${SRC}" "${INC}" "${INC_SYS}")
index 9dc0b7a4258eebe265c72ebe7ade2acadf18d903..d5f367194713f70cc6c15b0727742a939449f5d9 100644 (file)
@@ -30,6 +30,9 @@ set(INC
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/audaspace/intern
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -46,4 +49,4 @@ set(SRC
        sequencer_intern.h
 )
 
-blender_add_lib(bf_editor_space_sequencer "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_sequencer "${SRC}" "${INC}" "${INC_SYS}")
index 9e70d1dbda3e7c1a69c658c14dd0594e46424f8a..367d07c0c0bd4523a10350ad5b3169ba6b18f20b 100644 (file)
@@ -28,6 +28,9 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -38,4 +41,4 @@ set(SRC
        sound_intern.h
 )
 
-blender_add_lib(bf_editor_space_sound "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_sound "${SRC}" "${INC}" "${INC_SYS}")
index 6241d39741746eff48962d4ce611662fdf0f42f7..0c174225a58f5760c8b5bb13714c62f704fa5b74 100644 (file)
@@ -29,6 +29,9 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -43,8 +46,9 @@ set(SRC
 )
 
 if(WITH_PYTHON)
-       list(APPEND INC ${PYTHON_INCLUDE_DIRS} ../../python)
+       list(APPEND INC ../../python)
+       list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
        add_definitions(-DWITH_PYTHON)
 endif()
 
-blender_add_lib(bf_editor_text "${SRC}" "${INC}")
+blender_add_lib(bf_editor_text "${SRC}" "${INC}" "${INC_SYS}")
index 654930fc95d296659844e70f6efd3ee600afc040..79081c7cfd4d34e896ff9bc5120e49e0711af9a7 100644 (file)
@@ -28,6 +28,9 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -38,4 +41,4 @@ set(SRC
        time_intern.h
 )
 
-blender_add_lib(bf_editor_space_time "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_time "${SRC}" "${INC}" "${INC_SYS}")
index 68fe9d3e04c6ad94decc4f2a646f9ca06e01ec88..656a5d2f0effccf14958820eaae15badfab20b08 100644 (file)
@@ -30,6 +30,10 @@ set(INC
        ../../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        space_userpref.c
        userpref_ops.c
@@ -37,4 +41,4 @@ set(SRC
        userpref_intern.h
 )
 
-blender_add_lib(bf_editor_space_userpref "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_userpref "${SRC}" "${INC}" "${INC_SYS}")
index f923c578769367b16b42a2473b5c01be2f9dffab..0a12a28af8d37fe5f06ed6c7dbab49dbf93e098c 100644 (file)
@@ -33,6 +33,9 @@ set(INC
        ../../render/extern/include
        ../../../../intern/guardedalloc
        ../../../../intern/smoke/extern
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -64,4 +67,4 @@ endif()
 
 add_definitions(-DGLEW_STATIC)
 
-blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}")
index 1455dc789c740a699bf753c24dcdee439180660e..8eb8d538396d01771781bd7ed185b0fe611f2620 100644 (file)
@@ -28,6 +28,9 @@ set(INC
        ../../makesrna
        ../../windowmanager
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -46,4 +49,4 @@ set(SRC
        transform.h
 )
 
-blender_add_lib(bf_editor_transform "${SRC}" "${INC}")
+blender_add_lib(bf_editor_transform "${SRC}" "${INC}" "${INC_SYS}")
index 0be6ccaee2c5ed4f67d9976bcfa189fdb2a6a8ff..8e5415945c796feeeeb570c7611697149b961b25 100644 (file)
@@ -30,6 +30,10 @@ set(INC
        ../../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        ed_util.c
        editmode_undo.c
@@ -83,4 +87,4 @@ set(SRC
        ../include/UI_view2d.h
 )
 
-blender_add_lib(bf_editor_util "${SRC}" "${INC}")
+blender_add_lib(bf_editor_util "${SRC}" "${INC}" "${INC_SYS}")
index 60d730e8c52fe52d7486aeda2828484a47c97d1e..11e1703d84c465ffb1162545a8e347594c0e68e6 100644 (file)
@@ -29,6 +29,9 @@ set(INC
        ../../windowmanager
        ../../../../intern/guardedalloc
        ../../../../intern/opennl/extern
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -43,4 +46,4 @@ set(SRC
        uvedit_parametrizer.h
 )
 
-blender_add_lib(bf_editor_uvedit "${SRC}" "${INC}")
+blender_add_lib(bf_editor_uvedit "${SRC}" "${INC}" "${INC_SYS}")
index d6e2b56c06595e19f27c1b6d34b9db4db4802150..ce3150476f98ebc7eb6f4f4f08d8a8b40c0fcda3 100644 (file)
@@ -34,6 +34,9 @@ set(INC
        ../makesrna
        ../../../intern/guardedalloc
        ../../../intern/smoke/extern
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -55,5 +58,5 @@ set(SRC
 
 add_definitions(-DGLEW_STATIC)
 
-blender_add_lib(bf_gpu "${SRC}" "${INC}")
+blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}")
 
index 47c773756a919347c14f54323dbe1d3e8cfba266..da5c2f69635f13d0222b3e1089d474a9199f60ba 100644 (file)
@@ -33,6 +33,10 @@ set(INC
        ../../../intern/iksolver/extern
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        intern/ikplugin_api.c
        intern/iksolver_plugin.c
@@ -45,11 +49,13 @@ set(SRC
 
 if(WITH_IK_ITASC)
        add_definitions(-DWITH_IK_ITASC)
-       list(APPEND INC ../../../extern/Eigen2)
-       list(APPEND INC ../../../intern/itasc)
+       list(APPEND INC
+               ../../../extern/Eigen2
+               ../../../intern/itasc
+       )
        list(APPEND SRC
-               ./intern/itasc_plugin.cpp
+               intern/itasc_plugin.cpp
        )
 endif()
 
-blender_add_lib(bf_ikplugin "${SRC}" "${INC}")
+blender_add_lib(bf_ikplugin "${SRC}" "${INC}" "${INC_SYS}")
index ed4508053b832ded2c1959cc8bf9b192914213e6..16bc78546171ba70c18bea273a4d816d051e0e47 100644 (file)
@@ -39,6 +39,9 @@ set(INC
        ../../../intern/memutil
        ../../../intern/guardedalloc
        ../../../intern/ffmpeg
+)
+
+set(INC_SYS
        ${JPEG_INCLUDE_DIR}
        ${PNG_INCLUDE_DIR}
        ${ZLIB_INCLUDE_DIRS}
@@ -111,30 +114,28 @@ if(WITH_IMAGE_OPENEXR)
 endif()
 
 if(WITH_IMAGE_TIFF)
-       list(APPEND INC ${TIFF_INCLUDE_DIR})
+       list(APPEND INC_SYS ${TIFF_INCLUDE_DIR})
        add_definitions(-DWITH_TIFF)
 endif()
 
 if(WITH_IMAGE_OPENJPEG)
-       list(APPEND INC ${OPENJPEG_INC})
+       list(APPEND INC_SYS ${OPENJPEG_INC})
        add_definitions(-DWITH_OPENJPEG)
 endif()
 
 if(WITH_IMAGE_REDCODE)
-       list(APPEND INC ${REDCODE_INC})
+       list(APPEND INC_SYS ${REDCODE_INC})
        add_definitions(-DWITH_REDCODE)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC
-               ../quicktime
-               ${QUICKTIME_INC}
-       )
+       list(APPEND INC ../quicktime)
+       list(APPEND INC_SYS ${QUICKTIME_INC})
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-       list(APPEND INC ${FFMPEG_INC})
+       list(APPEND INC_SYS ${FFMPEG_INC})
        add_definitions(-DWITH_FFMPEG)
 endif()
 
@@ -150,4 +151,4 @@ if(WITH_IMAGE_HDR)
        add_definitions(-DWITH_HDR)
 endif()
 
-blender_add_lib(bf_imbuf "${SRC}" "${INC}")
+blender_add_lib(bf_imbuf "${SRC}" "${INC}" "${INC_SYS}")
index 92cba72c094aad3950d7fe6bbaec8a52ffaa6cac..079f34af773af0830db75a4835f36d126a34decc 100644 (file)
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC 
-               .
-               ..
-               ../..
-               ../../../blenkernel
-               ../../../blenloader
-               ../../../blenlib
-               ../../../makesdna
-               ../../../../../intern/guardedalloc
+       .
+       ..
+       ../..
+       ../../../blenkernel
+       ../../../blenloader
+       ../../../blenlib
+       ../../../makesdna
+       ../../../../../intern/guardedalloc
+)
+
+set(INC_SYS
+
 )
 
 set(SRC
@@ -44,4 +48,4 @@ set(SRC
        logmemfile.c
 )
 
-blender_add_lib(bf_imbuf_cineon "${SRC}" "${INC}")
+blender_add_lib(bf_imbuf_cineon "${SRC}" "${INC}" "${INC_SYS}")
index 7564287ce4abbf76828f866bb77c2a8b93f04618..fd2b94547b4d467fe070140f85b3047bc84ca81d 100644 (file)
@@ -28,13 +28,17 @@ set(INC
        .
        ..
        ../..
-       ./intern/include
+       intern/include
        ../../../blenlib
        ../../../blenkernel
        ../../../makesdna
        ../../../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        BlockDXT.cpp
        ColorBlock.cpp
@@ -48,4 +52,4 @@ if(WITH_IMAGE_DDS)
        add_definitions(-DWITH_DDS)
 endif()
 
-blender_add_lib(bf_imbuf_dds "${SRC}" "${INC}")                 
+blender_add_lib(bf_imbuf_dds "${SRC}" "${INC}" "${INC_SYS}")                 
index ace4f4f9a65455770cd3f4a196eca502e2c77731..c1140bc59a97a0c0d99f7e6b6839d409928cbebc 100644 (file)
@@ -33,7 +33,10 @@ set(INC
        intern/include
        ../../../../../intern/guardedalloc
        ../../../makesdna
-       ${OPENEXR_INC}
+)
+
+set(INC_SYS
+
 )
 
 set(SRC
@@ -41,7 +44,8 @@ set(SRC
 )
 
 if(WITH_IMAGE_OPENEXR)
+       list(APPEND INC_SYS ${OPENEXR_INC})
        add_definitions(-DWITH_OPENEXR)
 endif()
 
-blender_add_lib(bf_imbuf_openexr "${SRC}" "${INC}")                 
+blender_add_lib(bf_imbuf_openexr "${SRC}" "${INC}" "${INC_SYS}")                 
index bb95e2c0fbccb4ab2ca879dfec46e7c0b57ad4a9..429db63b5266f459ff0a078ae2c28e7ba098e3f7 100644 (file)
@@ -58,6 +58,11 @@ add_custom_command(
 
 # Build bf_dna library
 set(INC
+
+)
+
+set(INC_SYS
+
 )
 
 set(SRC
@@ -66,4 +71,4 @@ set(SRC
        ${SRC_DNA_INC}
 )
 
-blender_add_lib(bf_dna "${SRC}" "${INC}")
+blender_add_lib(bf_dna "${SRC}" "${INC}" "${INC_SYS}")
index 79edb91b972ef29a3628c4bb8a90893b2f81085d..4e4ff396e71e0e0ce3bf8085a90f3f8fe78f7d96 100644 (file)
@@ -131,8 +131,14 @@ set(SRC
 )
 
 set(INC
+
+)
+
+set(INC_SYS
+
 )
 
+
 if(WITH_PYTHON)
        add_definitions(-DWITH_PYTHON)
 endif()
@@ -171,7 +177,7 @@ if(WITH_CODEC_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-       list(APPEND INC ${FFMPEG_INC})
+       list(APPEND INC_SYS ${FFMPEG_INC})
        add_definitions(-DWITH_FFMPEG)
 endif()
 
@@ -217,6 +223,9 @@ blender_include_dirs(
        ../../../../intern/audaspace/intern
        ../../../../intern/guardedalloc
        ../../../../intern/memutil
+)
+
+blender_include_dirs_sys(
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -242,4 +251,4 @@ set(SRC
        rna_nodetree_types.h
 )
 
-blender_add_lib(bf_rna "${SRC}" "${INC}")
+blender_add_lib(bf_rna "${SRC}" "${INC}" "${INC_SYS}")
index 7abcb331f08ac0b95e9753c763e87ab9b4bbb125..cf66a27bda2d71934ed2a365765019b05c64354c 100644 (file)
@@ -34,6 +34,9 @@ set(INC
        ../render/extern/include
        ../../../intern/guardedalloc
        ../../../intern/elbeem/extern
+)
+
+set(INC_SYS
        ${ZLIB_INCLUDE_DIRS}
 )
 
@@ -85,9 +88,7 @@ set(SRC
 
 if(WITH_MOD_BOOLEAN)
        add_definitions(-DWITH_MOD_BOOLEAN)
-       list(APPEND SRC
-               intern/MOD_boolean_util.c
-       )
+       list(APPEND SRC intern/MOD_boolean_util.c)
        list(APPEND INC ../../../intern/bsp/extern)
 endif()
 
@@ -100,4 +101,4 @@ if(NOT WITH_MOD_FLUID)
        add_definitions(-DDISABLE_ELBEEM)
 endif()
 
-blender_add_lib(bf_modifiers "${SRC}" "${INC}")
+blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}")
index efd5523f5b270b8d7985fe6236599d822bafc158..d2b58d6111268560532ecfde980df4c5da594074 100644 (file)
@@ -34,6 +34,9 @@ set(INC
        ../makesrna
        ../render/extern/include
        ../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -149,9 +152,9 @@ set(SRC
 )
 
 if(WITH_PYTHON)
-       set(INC ${INC} ../python ${PYTHON_INCLUDE_DIRS})
+       list(APPEND INC ../python)
+       list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
        add_definitions(-DWITH_PYTHON)
 endif()
 
-blender_add_lib(bf_nodes "${SRC}" "${INC}")
-
+blender_add_lib(bf_nodes "${SRC}" "${INC}" "${INC_SYS}")
index 5e4eae4f809127319550c6b0f5efdc2211556ee2..0889c77f9ad31ccd3e3e2a5db963d1162b4ac11d 100644 (file)
@@ -25,6 +25,9 @@ set(INC
        ../../blenkernel
        ../../blenloader
        ../../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
        ${PYTHON_INCLUDE_DIRS}
 )
@@ -60,4 +63,4 @@ set(SRC
 )
 
 
-blender_add_lib(bf_python_ext "${SRC}" "${INC}")
+blender_add_lib(bf_python_ext "${SRC}" "${INC}" "${INC_SYS}")
index ab08dc14f07273b77a6a33a3edab15db6e23212f..454a706a16b3f5fd4c443926ba0db158215030df 100644 (file)
@@ -34,6 +34,9 @@ set(INC
        ../../editors/include
        ../../../../intern/guardedalloc
        ../../../../intern/audaspace/intern
+)
+
+set(INC_SYS
        ${PYTHON_INCLUDE_DIRS}
 )
 
@@ -81,4 +84,4 @@ if(WITH_PYTHON_SAFETY)
        add_definitions(-DWITH_PYTHON_SAFETY)
 endif()
 
-blender_add_lib(bf_python "${SRC}" "${INC}")
+blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}")
index 7e7f61036c6aa6513a0e5dda54841180615fde51..3b70cf19a7ff420196f9946be4b1138fd39f69e8 100644 (file)
 #
 # ***** END GPL LICENSE BLOCK *****
 
-if(USE_QTKIT)
-       set(SRC
-               apple/qtkit_import.m
-               apple/qtkit_export.m
-
-               quicktime_export.h
-               quicktime_import.h
-       )
-else()
-       set(SRC
-               apple/quicktime_import.c
-               apple/quicktime_export.c
-
-               quicktime_export.h
-               quicktime_import.h
-       )
-endif()
-
 set(INC 
        .
        ../quicktime
@@ -58,9 +40,30 @@ set(INC
        ../windowmanager
        ../../../intern/audaspace/intern
        ../../../intern/guardedalloc
+)
+
+set(INC_SYS
        ${QUICKTIME_INC}
 )
 
+if(USE_QTKIT)
+       set(SRC
+               apple/qtkit_import.m
+               apple/qtkit_export.m
+
+               quicktime_export.h
+               quicktime_import.h
+       )
+else()
+       set(SRC
+               apple/quicktime_import.c
+               apple/quicktime_export.c
+
+               quicktime_export.h
+               quicktime_import.h
+       )
+endif()
+
 add_definitions(-DWITH_QUICKTIME)
 
-blender_add_lib(bf_quicktime "${SRC}" "${INC}")
+blender_add_lib(bf_quicktime "${SRC}" "${INC}" "${INC_SYS}")
index bcb427abd6cf25b4292181ddbc4c866b3fcd9c3e..aea377a35bb277145d533d5199672f3a2b27c23c 100644 (file)
@@ -41,6 +41,10 @@ set(INC
        ../../../intern/guardedalloc
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        intern/raytrace/rayobject.cpp
        intern/raytrace/rayobject_empty.cpp
@@ -119,7 +123,8 @@ if(WITH_IMAGE_OPENEXR)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC ../quicktime ${QUICKTIME_INC})
+       list(APPEND INC ../quicktime)
+       list(APPEND INC_SYS ${QUICKTIME_INC})
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
@@ -130,4 +135,4 @@ if(APPLE)
        endif()
 endif()
 
-blender_add_lib_nolist(bf_render "${SRC}" "${INC}")
+blender_add_lib_nolist(bf_render "${SRC}" "${INC}" "${INC_SYS}")
index 6f03928e1fc562b0d3c8d51172e341cabf94ab84..76ba298cd5f01402b78e9eaec31ad114e062f482 100644 (file)
@@ -43,6 +43,9 @@ set(INC
        ../../../intern/ghost
        ../../../intern/opennl/extern
        ../../../source/gameengine/BlenderRoutines
+)
+
+set(INC_SYS
        ${ZLIB_INCLUDE_DIRS}
        ${OPENGL_INCLUDE_DIR}
        ${GLEW_INCLUDE_PATH}
@@ -50,7 +53,6 @@ set(INC
 
 set(SRC
        intern/wm.c
-       intern/wm_apple.c
        intern/wm_cursors.c
        intern/wm_dragdrop.c
        intern/wm_draw.c
@@ -87,17 +89,19 @@ if(WITH_OPENCOLLADA)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC ../quicktime ${QUICKTIME_INC})
+       list(APPEND INC ../quicktime)
+       list(APPEND INC_SYS ${QUICKTIME_INC})
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-       list(APPEND INC ${FFMPEG_INC})
+       list(APPEND INC_SYS ${FFMPEG_INC})
        add_definitions(-DWITH_FFMPEG)
 endif()
 
 if(WITH_PYTHON)
-       list(APPEND INC ../python ${PYTHON_INCLUDE_DIRS})
+       list(APPEND INC ../python)
+       list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
        add_definitions(-DWITH_PYTHON)
 
        if(WITH_PYTHON_SECURITY)
@@ -109,12 +113,14 @@ if(WITH_GAMEENGINE)
        add_definitions(-DWITH_GAMEENGINE)
 endif()
 
-if(WITH_COCOA)
-       list(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/wm_apple.c")
+if(APPLE)
+       if(NOT WITH_COCOA)
+               list(APPEND SRC intern/wm_apple.c)
+       endif()
 endif()
 
 if(WITH_BUILDINFO)
        add_definitions(-DNAN_BUILDINFO)
 endif()
 
-blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}")
+blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}")
index f52ac8ba3cb87f852dfdeed88583c096ab9db84f..fa5e660634742c81ebd674bfef532bfcb57ee9ca 100644 (file)
@@ -32,7 +32,7 @@ if env['OURPLATFORM'] == 'linux2':
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-if env['WITH_GHOST_COCOA']:
+if env['OURPLATFORM'] != 'darwin' or env['WITH_GHOST_COCOA']:
     sources.remove('intern/wm_apple.c')
 
 if env['BF_BUILDINFO']:
index 083500420a4bbf60871d5d60a4030ad08a5a2a76..7748efb6f641cc334231993ffe5ca2c9d71555bd 100644 (file)
@@ -30,8 +30,7 @@
  *  \ingroup wm
  */
 
-
-#ifdef __APPLE__
+/* note, this file builds on apple-carbon only! */
 
 #include "BKE_context.h"
 #include "BKE_global.h"
@@ -137,8 +136,3 @@ void wm_set_apple_prefsize(int scr_x, int scr_y)
                G.windowstate= 0;
        }
 }
-
-
-#endif /* __APPLE__ */
-
-
index 73fa01ebff28b71eb0bc78a550b55ccc6555b46e..2cc6dbc82559a5a701d7406ce929bc2b9e5c9cef 100644 (file)
@@ -37,15 +37,17 @@ set(INC
        ../../../source/blender/blenkernel
 )
 
+set(INC_SYS
+       
+)
+
 set(SRC
        stubs.c
 )
 
 if(WITH_BUILDINFO)
+       list(APPEND SRC ../../creator/buildinfo.c)
        add_definitions(-DBUILD_DATE)
-       list(APPEND SRC
-               ../../creator/buildinfo.c
-       )
 endif()
 
 if(WITH_GAMEENGINE)
@@ -56,4 +58,4 @@ if(WITH_INTERNATIONAL)
        add_definitions(-DWITH_FREETYPE2)
 endif()
 
-blender_add_lib_nolist(blenkernel_blc "${SRC}" "${INC}")
+blender_add_lib_nolist(blenkernel_blc "${SRC}" "${INC}" "${INC_SYS}")
index 6a17017f26191a1fe0bea485f81466a6b3c49668..a67e2eb703823ee661560ea810e1042447937cfc 100644 (file)
@@ -32,6 +32,10 @@ set(INC
        ${GLEW_INCLUDE_PATH}
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        BL_KetsjiEmbedStart.cpp
        BL_System.cpp
@@ -59,4 +63,4 @@ if(WITH_CODEC_FFMPEG)
        add_definitions(-DWITH_FFMPEG)
 endif()
 
-blender_add_lib(ge_blen_routines "${SRC}" "${INC}")
+blender_add_lib(ge_blen_routines "${SRC}" "${INC}" "${INC_SYS}")
index bdd0769e0a38c3ff44693fd6b9055d9f8fc2d37a..6cfd8c9b42baac67797cbdedc400f056b58ef8f4 100644 (file)
@@ -59,6 +59,10 @@ set(INC
        ../../../extern/bullet2/src
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        BL_ActionActuator.cpp
        BL_ArmatureActuator.cpp
@@ -109,4 +113,4 @@ if(WITH_BULLET)
        add_definitions(-DUSE_BULLET)
 endif()
 
-blender_add_lib(ge_converter "${SRC}" "${INC}")
+blender_add_lib(ge_converter "${SRC}" "${INC}" "${INC_SYS}")
index 8cda0e2dc77ace6e5b2364a42a7e1f04cac6d634..83d44e1b318e0ec9a1f48715b848c5a670d81943 100644 (file)
@@ -33,6 +33,10 @@ set(INC
        ../../../source/blender/blenloader
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        BoolValue.cpp
        ConstExpr.cpp
@@ -77,4 +81,4 @@ set(SRC
        VoidValue.h
 )
 
-blender_add_lib(ge_logic_expressions "${SRC}" "${INC}")
+blender_add_lib(ge_logic_expressions "${SRC}" "${INC}" "${INC_SYS}")
index 2acf07584b174b1e2e395b186d31aa7b91c5855f..b6721650badf4601fa9ad8c0d1c402bbe69183f4 100644 (file)
@@ -34,6 +34,10 @@ set(INC
        ../../../source/gameengine/Rasterizer
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        Joystick/SCA_Joystick.cpp
        Joystick/SCA_JoystickEvents.cpp
@@ -124,9 +128,9 @@ set(SRC
 )
 
 if(WITH_SDL)
-       set(INC ${INC} ${SDL_INCLUDE_DIR})
+       list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
 else()
        add_definitions(-DDISABLE_SDL)
 endif()
 
-blender_add_lib(ge_logic "${SRC}" "${INC}")
+blender_add_lib(ge_logic "${SRC}" "${INC}" "${INC_SYS}")
index afbc49ea38d9b0010c9d4128f72d3ada1c6d7a6f..d16ec6a2f222f5980ca305d3aaa8991053efd8f9 100644 (file)
@@ -51,6 +51,9 @@ set(INC
        ../../../../source/gameengine/GamePlayer/ghost
        ../../../../source/blender/blenloader
        ../../../../source/blender/gpu
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
        ${PYTHON_INCLUDE_DIRS}
        ${PNG_INCLUDE_DIR}
@@ -82,4 +85,4 @@ set(SRC
 
 add_definitions(-DGLEW_STATIC)
 
-blender_add_lib_nolist(ge_player_common "${SRC}" "${INC}")
+blender_add_lib_nolist(ge_player_common "${SRC}" "${INC}" "${INC_SYS}")
index 389300efc2137efdf73b4a4b90fa9f70b3c7bac7..5ac121099c382f04a1e159441508f4f77472e3f8 100644 (file)
@@ -52,6 +52,9 @@ set(INC
        ../../../../source/gameengine/GamePlayer/common
        ../../../../source/blender/blenloader
        ../../../../source/blender/gpu
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
        ${PYTHON_INCLUDE_DIRS}
 )
@@ -75,4 +78,4 @@ if(WITH_CODEC_FFMPEG)
        add_definitions(-DWITH_FFMPEG)
 endif()
 
-blender_add_lib_nolist(ge_player_ghost "${SRC}" "${INC}")
+blender_add_lib_nolist(ge_player_ghost "${SRC}" "${INC}" "${INC_SYS}")
index 0bfe1fd0266c7e1d1f41e256df9be53afb7ff0bb..a6339439beaf3297dcea44c02b7e274f314b98a2 100644 (file)
@@ -53,6 +53,9 @@ set(INC
        ../../../intern/audaspace/intern
        ../../../source/blender/blenloader
        ../../../source/blender/gpu
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -207,7 +210,7 @@ set(SRC
 add_definitions(-DGLEW_STATIC)
 
 if(WITH_SDL)
-       set(INC ${INC} ${SDL_INCLUDE_DIR})  
+       list(APPEND INC_SYS ${SDL_INCLUDE_DIR})  
 else()
        add_definitions(-DDISABLE_SDL)
 endif()
@@ -217,9 +220,11 @@ if(WITH_CODEC_FFMPEG)
 endif()
 
 if(WITH_BULLET)
+       list(APPEND INC
+               ../../../extern/bullet2/src
+               ../../../source/gameengine/Physics/Bullet
+       )
        add_definitions(-DUSE_BULLET)
-       list(APPEND INC ../../../extern/bullet2/src)
-       list(APPEND INC ../../../source/gameengine/Physics/Bullet )
 endif()
 
-blender_add_lib(ge_logic_ketsji "${SRC}" "${INC}")
+blender_add_lib(ge_logic_ketsji "${SRC}" "${INC}" "${INC_SYS}")
index 17a5929420db292a8751ce5de9063c53c3f4570a..b814956680169fcff86aff29614433a85c1cb853 100644 (file)
@@ -36,6 +36,10 @@ set(INC
        ../../../../source/gameengine/Network
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        KX_NetworkEventManager.cpp
        KX_NetworkMessageActuator.cpp
@@ -50,4 +54,4 @@ set(SRC
        KX_NetworkObjectSensor.h
 )
 
-blender_add_lib(ge_logic_network "${SRC}" "${INC}")
+blender_add_lib(ge_logic_network "${SRC}" "${INC}" "${INC_SYS}")
index 7f4c7c357da478491150588c7127130ff8542ec4..e1f3bfaac77c62553216b828a0e467e65f65fef2 100644 (file)
@@ -31,6 +31,10 @@ set(INC
        ../../../intern/moto/include
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        NG_NetworkMessage.cpp
        NG_NetworkObject.cpp
@@ -42,4 +46,4 @@ set(SRC
        NG_NetworkScene.h
 )
 
-blender_add_lib(ge_logic_ngnetwork "${SRC}" "${INC}")
+blender_add_lib(ge_logic_ngnetwork "${SRC}" "${INC}" "${INC_SYS}")
index d7b88304474b4c561e4c1a1efb4fb78c3078eb93..9c3936987f224e9746b6b950f5f465e6b725d111 100644 (file)
@@ -31,10 +31,14 @@ set(INC
        ../../../../source/gameengine/Network
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        NG_LoopBackNetworkDeviceInterface.cpp
 
        NG_LoopBackNetworkDeviceInterface.h
 )
 
-blender_add_lib(ge_logic_loopbacknetwork "${SRC}" "${INC}")
+blender_add_lib(ge_logic_loopbacknetwork "${SRC}" "${INC}" "${INC_SYS}")
index a984d0436f0deb73d4f7d12cb96bca0d33801fb1..aadd11cc0364788e04856fb15265c200005db5e8 100644 (file)
@@ -43,6 +43,9 @@ set(INC
        ../../../../source/blender/makesdna
        ../../../../source/blender/blenlib
        ../../../../source/blender/blenkernel
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
        ${PYTHON_INCLUDE_DIRS}
 )
@@ -61,4 +64,4 @@ if(WITH_BULLET)
        add_definitions(-DUSE_BULLET)
 endif()
 
-blender_add_lib(ge_phys_bullet "${SRC}" "${INC}")
+blender_add_lib(ge_phys_bullet "${SRC}" "${INC}" "${INC_SYS}")
index fd7f37897eb03fe873bf6fe47f8ebf683b27e5c5..11230bbe571ef0cc71a2c84e7f0f16ea65e798b5 100644 (file)
@@ -29,10 +29,14 @@ set(INC
        ../common
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        DummyPhysicsEnvironment.cpp
 
        DummyPhysicsEnvironment.h
 )
 
-blender_add_lib(ge_phys_dummy "${SRC}" "${INC}")
+blender_add_lib(ge_phys_dummy "${SRC}" "${INC}" "${INC_SYS}")
index 50aa9083089cb6327aae7da66824992e7ab01fad..9da7aaa6ba742a9d6954bd78012725e2273bac6b 100644 (file)
@@ -29,6 +29,10 @@ set(INC
        ../Dummy
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        PHY_IMotionState.cpp
        PHY_IController.cpp
@@ -47,4 +51,4 @@ set(SRC
        PHY_Pro.h
 )
 
-blender_add_lib(ge_phys_common "${SRC}" "${INC}")
+blender_add_lib(ge_phys_common "${SRC}" "${INC}" "${INC_SYS}")
index 2bfb3f8f328628e926b4e5cac850ef9821961630..b705d3151b2e119a1957805aaee247e22fe69722 100644 (file)
@@ -34,6 +34,9 @@ set(INC
        ../../../intern/moto/include
        ../../../intern/guardedalloc
        ../Expressions
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
        ${PYTHON_INCLUDE_DIRS}
 )
@@ -81,4 +84,4 @@ set(SRC
 
 add_definitions(-DGLEW_STATIC)
 
-blender_add_lib(ge_rasterizer "${SRC}" "${INC}")
+blender_add_lib(ge_rasterizer "${SRC}" "${INC}" "${INC_SYS}")
index 99068aa1bb8936784fbf3c9e5b513efad1118b99..a005bb1108d603d4aa46a1ca88fc2569d3f75880 100644 (file)
@@ -37,6 +37,9 @@ set(INC
        ../../../../source/blender/blenkernel
        ../../../../source/blender/blenlib
        ../../../../source/blender/blenloader
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -54,4 +57,4 @@ set(SRC
 
 add_definitions(-DGLEW_STATIC)
 
-blender_add_lib(ge_oglrasterizer "${SRC}" "${INC}")
+blender_add_lib(ge_oglrasterizer "${SRC}" "${INC}" "${INC_SYS}")
index a054252ea0bddbc10bdbeee1772ea6108d41059b..2f6b90a21a7718445bb7e88831a5e1b06c362c0d 100644 (file)
@@ -29,6 +29,10 @@ set(INC
        ../../../intern/moto/include
 )
 
+set(INC_SYS
+
+)
+
 set(SRC
        SG_BBox.cpp
        SG_Controller.cpp
@@ -48,4 +52,4 @@ set(SRC
        SG_Tree.h
 )
 
-blender_add_lib(ge_scenegraph "${SRC}" "${INC}")
+blender_add_lib(ge_scenegraph "${SRC}" "${INC}" "${INC_SYS}")
index b544139d4a78119d55acdda94648b8a2a4cbae91..201714be74a9da2642eecbd1e76e62282c2687fe 100644 (file)
@@ -46,6 +46,9 @@ set(INC
        ../../../intern/moto/include
        ../../../intern/guardedalloc
        ../../../intern/ffmpeg
+)
+
+set(INC_SYS
        ${GLEW_INCLUDE_PATH}
 )
 
@@ -87,9 +90,12 @@ set(SRC
 )
 
 if(WITH_CODEC_FFMPEG)
-       set(INC ${INC} ${FFMPEG_INC} ${PTHREADS_INC})
+       list(APPEND INC_SYS
+               ${FFMPEG_INC}
+               ${PTHREADS_INC}
+       )
        add_definitions(-DWITH_FFMPEG)
        add_definitions(-D__STDC_CONSTANT_MACROS)
 endif()
 
-blender_add_lib(ge_videotex "${SRC}" "${INC}")
+blender_add_lib(ge_videotex "${SRC}" "${INC}" "${INC_SYS}")