diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-31 09:28:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-31 09:28:00 +0400 |
commit | 8949387186ef59bd0ba28cfe0c0e14a3ab5ac2d6 (patch) | |
tree | e5746dba9292c4383730b092d09536247516bb5a /source/blender | |
parent | 08d6932c860e7f2926e3980764fc5e11a821d0a3 (diff) | |
parent | 09da9d43931a09e3786343e724a3de7217285d0d (diff) |
svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender')
61 files changed, 339 insertions, 136 deletions
diff --git a/source/blender/avi/CMakeLists.txt b/source/blender/avi/CMakeLists.txt index 77a43e5560e..b62e0cc5afd 100644 --- a/source/blender/avi/CMakeLists.txt +++ b/source/blender/avi/CMakeLists.txt @@ -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}") diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index 48ee4aed033..b915764c1bb 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -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}") diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 55a0ced673a..84f8ea42bd1 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -56,6 +56,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} ) @@ -272,17 +275,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) @@ -303,12 +308,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() @@ -316,4 +321,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}") diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 833449aaf24..674a020edb0 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -32,6 +32,9 @@ set(INC ../gpu ../../../intern/ghost ../../../intern/guardedalloc +) + +set(INC_SYS ${ZLIB_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ) @@ -139,12 +142,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}") diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index 888cf3148e3..312a6546e22 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -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}") diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt index 1e3a3398861..c3aad25ccbe 100644 --- a/source/blender/blenpluginapi/CMakeLists.txt +++ b/source/blender/blenpluginapi/CMakeLists.txt @@ -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}") diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index b377e7612d4..23cf2c71472 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -54,6 +54,9 @@ set(INC ../../../intern/smoke/extern ../../../intern/mikktspace ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h +) + +set(INC_SYS ${ZLIB_INCLUDE_DIRS} ) @@ -112,12 +115,12 @@ set(SRC add_definitions(-DGLEW_STATIC) 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() @@ -125,4 +128,4 @@ if(MSVC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") endif() -blender_add_lib(bf_bmesh "${SRC}" "${INC}") +blender_add_lib(bf_bmesh "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index fa7bfee8ee5..a7e7c973f36 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt index 8fc1ec429cc..a3c1d035d9b 100644 --- a/source/blender/editors/animation/CMakeLists.txt +++ b/source/blender/editors/animation/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt index 3234254f745..2db6e278460 100644 --- a/source/blender/editors/armature/CMakeLists.txt +++ b/source/blender/editors/armature/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt index a73fb9502a6..dfc7e336e84 100644 --- a/source/blender/editors/curve/CMakeLists.txt +++ b/source/blender/editors/curve/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index a359b0ef6f5..8761297b979 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -19,7 +19,13 @@ # # ***** 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}") diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt index 71199ee9580..352960d285a 100644 --- a/source/blender/editors/gpencil/CMakeLists.txt +++ b/source/blender/editors/gpencil/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index cf0c903e0a5..9902cac8857 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index 207535033ff..6095de2c105 100644 --- a/source/blender/editors/mesh/CMakeLists.txt +++ b/source/blender/editors/mesh/CMakeLists.txt @@ -32,6 +32,9 @@ set(INC ../../windowmanager ../../render/extern/include ../../../../intern/guardedalloc +) + +set(INC_SYS ${GLEW_INCLUDE_PATH} ) @@ -53,4 +56,4 @@ set(SRC mesh_intern.h ) -blender_add_lib(bf_editor_mesh "${SRC}" "${INC}") +blender_add_lib(bf_editor_mesh "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt index af3d25699ed..690a8ec2fcb 100644 --- a/source/blender/editors/metaball/CMakeLists.txt +++ b/source/blender/editors/metaball/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index edf3834002e..d370e036229 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -36,6 +36,10 @@ set(INC ../../../../intern/guardedalloc ) +set(INC_SYS + +) + set(SRC object_add.c object_bake.c @@ -59,4 +63,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}") diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt index 8d51d6eec37..1badccffe3b 100644 --- a/source/blender/editors/physics/CMakeLists.txt +++ b/source/blender/editors/physics/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index 61c26df5ac8..27974da0ecf 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -33,6 +33,9 @@ set(INC ../../render/extern/include ../../windowmanager ../../../../intern/guardedalloc +) + +set(INC_SYS ${GLEW_INCLUDE_PATH} ) @@ -49,7 +52,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() @@ -57,4 +61,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}") diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index 3098c26f638..a6638a7feab 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -31,6 +31,9 @@ set(INC ../../makesrna ../../windowmanager ../../../../intern/guardedalloc +) + +set(INC_SYS ${GLEW_INCLUDE_PATH} ) @@ -45,4 +48,4 @@ set(SRC screen_intern.h ) -blender_add_lib(bf_editor_screen "${SRC}" "${INC}") +blender_add_lib(bf_editor_screen "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index 248b6ea2b94..6ecbc9c5eec 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index c2f7707309b..6a99971a5af 100644 --- a/source/blender/editors/sound/CMakeLists.txt +++ b/source/blender/editors/sound/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt index 7c52f4a9efb..6789556aa2b 100644 --- a/source/blender/editors/space_action/CMakeLists.txt +++ b/source/blender/editors/space_action/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt index 64ad1f9c419..12361e790e4 100644 --- a/source/blender/editors/space_api/CMakeLists.txt +++ b/source/blender/editors/space_api/CMakeLists.txt @@ -31,9 +31,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}") diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt index e9670949cd5..0a4f251e46f 100644 --- a/source/blender/editors/space_buttons/CMakeLists.txt +++ b/source/blender/editors/space_buttons/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt index 14e7f4a90d0..f89d782c7f2 100644 --- a/source/blender/editors/space_console/CMakeLists.txt +++ b/source/blender/editors/space_console/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index 0a3bce76466..e161e2d4b9b 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index 59f2b22516d..f5548097db2 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index daf7ba1e38b..8e2836388cb 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -32,6 +32,9 @@ set(INC ../../windowmanager ../../render/extern/include ../../../../intern/guardedalloc +) + +set(INC_SYS ${GLEW_INCLUDE_PATH} ) @@ -60,4 +63,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}") diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt index 3322802de47..7f4b370c371 100644 --- a/source/blender/editors/space_info/CMakeLists.txt +++ b/source/blender/editors/space_info/CMakeLists.txt @@ -31,6 +31,9 @@ set(INC ../../makesrna ../../windowmanager ../../../../intern/guardedalloc +) + +set(INC_SYS ${GLEW_INCLUDE_PATH} ) @@ -46,4 +49,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}") diff --git a/source/blender/editors/space_logic/CMakeLists.txt b/source/blender/editors/space_logic/CMakeLists.txt index 6323ef779c2..cd24cb5e5d0 100644 --- a/source/blender/editors/space_logic/CMakeLists.txt +++ b/source/blender/editors/space_logic/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt index 59ccb204d8c..1bf04f4dc37 100644 --- a/source/blender/editors/space_nla/CMakeLists.txt +++ b/source/blender/editors/space_nla/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index 8604ba3baed..9172bc4e9eb 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/source/blender/editors/space_node/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index 871dec4dfc5..c05350c256f 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt index 974dc66e22c..1aed177eed1 100644 --- a/source/blender/editors/space_script/CMakeLists.txt +++ b/source/blender/editors/space_script/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index 9dc0b7a4258..d5f36719471 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_sound/CMakeLists.txt b/source/blender/editors/space_sound/CMakeLists.txt index 9e70d1dbda3..367d07c0c0b 100644 --- a/source/blender/editors/space_sound/CMakeLists.txt +++ b/source/blender/editors/space_sound/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index 6241d397417..0c174225a58 100644 --- a/source/blender/editors/space_text/CMakeLists.txt +++ b/source/blender/editors/space_text/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_time/CMakeLists.txt b/source/blender/editors/space_time/CMakeLists.txt index 654930fc95d..79081c7cfd4 100644 --- a/source/blender/editors/space_time/CMakeLists.txt +++ b/source/blender/editors/space_time/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt index 68fe9d3e04c..656a5d2f0ef 100644 --- a/source/blender/editors/space_userpref/CMakeLists.txt +++ b/source/blender/editors/space_userpref/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index 95a278e329a..9f9395b1284 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -34,6 +34,9 @@ set(INC ../../render/extern/include ../../../../intern/guardedalloc ../../../../intern/smoke/extern +) + +set(INC_SYS ${GLEW_INCLUDE_PATH} ) @@ -65,4 +68,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}") diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt index 05f46edb7a4..9de130bb99c 100644 --- a/source/blender/editors/transform/CMakeLists.txt +++ b/source/blender/editors/transform/CMakeLists.txt @@ -29,6 +29,9 @@ set(INC ../../makesrna ../../windowmanager ../../../../intern/guardedalloc +) + +set(INC_SYS ${GLEW_INCLUDE_PATH} ) @@ -47,4 +50,4 @@ set(SRC transform.h ) -blender_add_lib(bf_editor_transform "${SRC}" "${INC}") +blender_add_lib(bf_editor_transform "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index 511b1ab49e0..f9fbd0a9c12 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -31,6 +31,10 @@ set(INC ../../../../intern/guardedalloc ) +set(INC_SYS + +) + set(SRC ed_util.c editmode_undo.c @@ -84,4 +88,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}") diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt index 027f7f62203..84cdb6a0f71 100644 --- a/source/blender/editors/uvedit/CMakeLists.txt +++ b/source/blender/editors/uvedit/CMakeLists.txt @@ -30,6 +30,9 @@ set(INC ../../windowmanager ../../../../intern/guardedalloc ../../../../intern/opennl/extern +) + +set(INC_SYS ${GLEW_INCLUDE_PATH} ) @@ -44,4 +47,4 @@ set(SRC uvedit_parametrizer.h ) -blender_add_lib(bf_editor_uvedit "${SRC}" "${INC}") +blender_add_lib(bf_editor_uvedit "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index d6e2b56c065..ce3150476f9 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -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}") diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt index 47c773756a9..da5c2f69635 100644 --- a/source/blender/ikplugin/CMakeLists.txt +++ b/source/blender/ikplugin/CMakeLists.txt @@ -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}") diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index ed4508053b8..16bc7854617 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -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}") diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt index 92cba72c094..079f34af773 100644 --- a/source/blender/imbuf/intern/cineon/CMakeLists.txt +++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt @@ -25,14 +25,18 @@ # ***** 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}") diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt index 7564287ce4a..fd2b94547b4 100644 --- a/source/blender/imbuf/intern/dds/CMakeLists.txt +++ b/source/blender/imbuf/intern/dds/CMakeLists.txt @@ -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}") diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt index ace4f4f9a65..c1140bc59a9 100644 --- a/source/blender/imbuf/intern/openexr/CMakeLists.txt +++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt @@ -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}") diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index bb95e2c0fbc..429db63b526 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -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}") diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 8eec0f00c5a..e0bd3df60f0 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -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() @@ -218,6 +224,9 @@ blender_include_dirs( ../../../../intern/audaspace/intern ../../../../intern/guardedalloc ../../../../intern/memutil +) + +blender_include_dirs_sys( ${GLEW_INCLUDE_PATH} ) @@ -243,4 +252,4 @@ set(SRC rna_nodetree_types.h ) -blender_add_lib(bf_rna "${SRC}" "${INC}") +blender_add_lib(bf_rna "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index ede55eafbf7..657c20a06a3 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -35,6 +35,9 @@ set(INC ../render/extern/include ../../../intern/guardedalloc ../../../intern/elbeem/extern +) + +set(INC_SYS ${ZLIB_INCLUDE_DIRS} ) @@ -87,9 +90,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() @@ -102,4 +103,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}") diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index efd5523f5b2..d2b58d61112 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -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}") diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index 5e4eae4f809..0889c77f9ad 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -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}") diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index ab08dc14f07..454a706a16b 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -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}") diff --git a/source/blender/quicktime/CMakeLists.txt b/source/blender/quicktime/CMakeLists.txt index 7e7f61036c6..3b70cf19a7f 100644 --- a/source/blender/quicktime/CMakeLists.txt +++ b/source/blender/quicktime/CMakeLists.txt @@ -24,24 +24,6 @@ # # ***** 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}") diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index bcb427abd6c..aea377a35bb 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -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}") diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index e01ed4a7f1b..223f2e9b654 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -44,6 +44,9 @@ set(INC ../../../intern/ghost ../../../intern/opennl/extern ../../../source/gameengine/BlenderRoutines +) + +set(INC_SYS ${ZLIB_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR} ${GLEW_INCLUDE_PATH} @@ -51,7 +54,6 @@ set(INC set(SRC intern/wm.c - intern/wm_apple.c intern/wm_cursors.c intern/wm_dragdrop.c intern/wm_draw.c @@ -88,17 +90,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) @@ -110,12 +114,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}") diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 664a424a60b..8e303a6d277 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -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']: diff --git a/source/blender/windowmanager/intern/wm_apple.c b/source/blender/windowmanager/intern/wm_apple.c index 083500420a4..7748efb6f64 100644 --- a/source/blender/windowmanager/intern/wm_apple.c +++ b/source/blender/windowmanager/intern/wm_apple.c @@ -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__ */ - - |