archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

cmake maintenance

Browse Source 
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.
This commit is contained in:
Campbell Barton
2011-05-31 01:15:44 +00:00
parent dcd55cef86
commit 09da9d4393
102 changed files with 594 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
build_files/cmake/macros.cmake
View 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()

14
extern/binreloc/CMakeLists.txt vendored
View File

@@ -18,17 +18,21 @@
# 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}")

7
extern/bullet2/CMakeLists.txt vendored
View File

@@ -29,6 +29,10 @@ set(INC
src
)
set(INC_SYS
)
set(SRC
src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp
@@ -146,7 +150,6 @@ set(SRC
src/LinearMath/btQuickprof.cpp
src/LinearMath/btSerializer.cpp
src/Bullet-C-Api.h
src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.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}")

8
extern/glew/CMakeLists.txt vendored
View 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}")

6
extern/libopenjpeg/CMakeLists.txt vendored
View 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}")

5
extern/libredcode/CMakeLists.txt vendored
View 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}")

6
extern/lzma/CMakeLists.txt vendored
View 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}")

6
extern/lzo/CMakeLists.txt vendored
View 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}")

59
intern/audaspace/CMakeLists.txt
View File

@@ -23,12 +23,15 @@
set(INC
.
intern
FX SRC
${PTHREADS_INC}
${LIBSAMPLERATE_INC}
FX
SRC
../ffmpeg
)
set(INC_SYS
${PTHREADS_INC}
)
set(SRC
FX/AUD_AccumulatorFactory.cpp
FX/AUD_BaseIIRFilterReader.cpp
@@ -156,8 +159,9 @@ set(SRC
if(WITH_CODEC_FFMPEG)
add_definitions(-DWITH_FFMPEG)
list(APPEND INC ffmpeg ${FFMPEG_INC})
set(FFMPEGSRC
list(APPEND INC ffmpeg)
list(APPEND INC_SYS ${FFMPEG_INC})
list(APPEND SRC
ffmpeg/AUD_FFMPEGFactory.cpp
ffmpeg/AUD_FFMPEGReader.cpp
@@ -168,8 +172,9 @@ endif()
if(WITH_SDL)
add_definitions(-DWITH_SDL)
list(APPEND INC SDL ${SDL_INCLUDE_DIR})
set(SDLSRC
list(APPEND INC SDL)
list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
list(APPEND SRC
SDL/AUD_SDLDevice.cpp
SDL/AUD_SDLDevice.h
@@ -178,8 +183,9 @@ 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
@@ -188,8 +194,9 @@ 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}")

6
intern/boolop/CMakeLists.txt
View 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}")

6
intern/bsp/CMakeLists.txt
View 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}")

6
intern/container/CMakeLists.txt
View 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}")

6
intern/decimation/CMakeLists.txt
View 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}")

5
intern/elbeem/CMakeLists.txt
View File

@@ -26,6 +26,9 @@
set(INC
extern
)
set(INC_SYS
${PNG_INCLUDE_DIR}
${ZLIB_INCLUDE_DIRS}
)
@@ -95,4 +98,4 @@ if(WITH_OPENMP)
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}")

11
intern/ghost/CMakeLists.txt
View 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}")

12
intern/guardedalloc/CMakeLists.txt
View File

@@ -24,7 +24,13 @@
#
# ***** END GPL LICENSE BLOCK *****
set(INC .)
set(INC
.
)
set(INC_SYS
)
set(SRC
./intern/mallocn.c
@@ -41,12 +47,12 @@ if(WIN32 AND NOT UNIX)
)
endif()
blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}")
blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}" "${INC_SYS}")
# Override C++ alloc, optional.
if(WITH_CXX_GUARDEDALLOC)
set(SRC
cpp/mallocn.cpp
)
blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}")
blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}" "${INC_SYS}")
endif()

6
intern/iksolver/CMakeLists.txt
View 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}")

6
intern/itasc/CMakeLists.txt
View 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}")

6
intern/memutil/CMakeLists.txt
View 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}")

6
intern/mikktspace/CMakeLists.txt
View 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}")

6
intern/moto/CMakeLists.txt
View 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}")

6
intern/opennl/CMakeLists.txt
View 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}")

5
intern/smoke/CMakeLists.txt
View 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}")

6
intern/string/CMakeLists.txt
View 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}")

5
source/blender/avi/CMakeLists.txt
View 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}")

7
source/blender/blenfont/CMakeLists.txt
View 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}")

17
source/blender/blenkernel/CMakeLists.txt
View 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}")

7
source/blender/blenlib/CMakeLists.txt
View 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}")

5
source/blender/blenloader/CMakeLists.txt
View 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}")

8
source/blender/blenpluginapi/CMakeLists.txt
View 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}")

10
source/blender/collada/CMakeLists.txt
View 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}")

5
source/blender/editors/animation/CMakeLists.txt
View 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}")

5
source/blender/editors/armature/CMakeLists.txt
View 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}")

6
source/blender/editors/curve/CMakeLists.txt
View 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}")

10
source/blender/editors/datafiles/CMakeLists.txt
View File

@@ -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}")

5
source/blender/editors/gpencil/CMakeLists.txt
View 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}")

5
source/blender/editors/interface/CMakeLists.txt
View 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}")

5
source/blender/editors/mesh/CMakeLists.txt
View 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}")

6
source/blender/editors/metaball/CMakeLists.txt
View 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}")

6
source/blender/editors/object/CMakeLists.txt
View 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}")

5
source/blender/editors/physics/CMakeLists.txt
View File

@@ -29,6 +29,9 @@ set(INC
../../windowmanager
../../../../intern/elbeem/extern
../../../../intern/guardedalloc
)
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
@@ -51,4 +54,4 @@ if(WITH_OPENMP)
add_definitions(-DPARALLEL=1)
endif()
blender_add_lib(bf_editor_physics "${SRC}" "${INC}")
blender_add_lib(bf_editor_physics "${SRC}" "${INC}" "${INC_SYS}")

8
source/blender/editors/render/CMakeLists.txt
View 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}")

5
source/blender/editors/screen/CMakeLists.txt
View 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}")

5
source/blender/editors/sculpt_paint/CMakeLists.txt
View 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}")

6
source/blender/editors/sound/CMakeLists.txt
View 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}")

5
source/blender/editors/space_action/CMakeLists.txt
View 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}")

6
source/blender/editors/space_api/CMakeLists.txt
View 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}")

5
source/blender/editors/space_buttons/CMakeLists.txt
View 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}")

5
source/blender/editors/space_console/CMakeLists.txt
View 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}")

5
source/blender/editors/space_file/CMakeLists.txt
View 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}")

5
source/blender/editors/space_graph/CMakeLists.txt
View 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}")

5
source/blender/editors/space_image/CMakeLists.txt
View 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}")

5
source/blender/editors/space_info/CMakeLists.txt
View 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}")

5
source/blender/editors/space_logic/CMakeLists.txt
View 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}")

5
source/blender/editors/space_nla/CMakeLists.txt
View 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}")

5
source/blender/editors/space_node/CMakeLists.txt
View 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}")

5
source/blender/editors/space_outliner/CMakeLists.txt
View 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}")

8
source/blender/editors/space_script/CMakeLists.txt
View 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}")

5
source/blender/editors/space_sequencer/CMakeLists.txt
View 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}")

5
source/blender/editors/space_sound/CMakeLists.txt
View 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}")

8
source/blender/editors/space_text/CMakeLists.txt
View 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}")

5
source/blender/editors/space_time/CMakeLists.txt
View 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}")

6
source/blender/editors/space_userpref/CMakeLists.txt
View 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}")

5
source/blender/editors/space_view3d/CMakeLists.txt
View 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}")

5
source/blender/editors/transform/CMakeLists.txt
View 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}")

6
source/blender/editors/util/CMakeLists.txt
View 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}")

5
source/blender/editors/uvedit/CMakeLists.txt
View 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}")

5
source/blender/gpu/CMakeLists.txt
View 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}")

14
source/blender/ikplugin/CMakeLists.txt
View 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}")

19
source/blender/imbuf/CMakeLists.txt
View 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}")

6
source/blender/imbuf/intern/cineon/CMakeLists.txt
View File

@@ -35,6 +35,10 @@ set(INC
../../../../../intern/guardedalloc
)
set(INC_SYS
)
set(SRC
cineon_dpx.c
cineonlib.c
@@ -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}")

8
source/blender/imbuf/intern/dds/CMakeLists.txt
View 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}")

8
source/blender/imbuf/intern/openexr/CMakeLists.txt
View 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}")

7
source/blender/makesdna/intern/CMakeLists.txt
View 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}")

13
source/blender/makesrna/intern/CMakeLists.txt
View 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}")

9
source/blender/modifiers/CMakeLists.txt
View 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}")

9
source/blender/nodes/CMakeLists.txt
View 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}")

5
source/blender/python/generic/CMakeLists.txt
View 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}")

5
source/blender/python/intern/CMakeLists.txt
View 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}")

43
source/blender/quicktime/CMakeLists.txt
View File

@@ -24,6 +24,28 @@
#
# ***** END GPL LICENSE BLOCK *****
set(INC
.
../quicktime
../makesdna
../makesrna
../blenlib
../blenkernel
../avi
../imbuf
../imbuf/intern
../blenloader
../render/extern/include
../include
../windowmanager
../../../intern/audaspace/intern
../../../intern/guardedalloc
)
set(INC_SYS
${QUICKTIME_INC}
)
if(USE_QTKIT)
set(SRC
apple/qtkit_import.m
@@ -42,25 +64,6 @@ else()
)
endif()
set(INC
.
../quicktime
../makesdna
../makesrna
../blenlib
../blenkernel
../avi
../imbuf
../imbuf/intern
../blenloader
../render/extern/include
../include
../windowmanager
../../../intern/audaspace/intern
../../../intern/guardedalloc
${QUICKTIME_INC}
)
add_definitions(-DWITH_QUICKTIME)
blender_add_lib(bf_quicktime "${SRC}" "${INC}")
blender_add_lib(bf_quicktime "${SRC}" "${INC}" "${INC_SYS}")

9
source/blender/render/CMakeLists.txt
View 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}")

20
source/blender/windowmanager/CMakeLists.txt
View 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}")

2
source/blender/windowmanager/SConscript
View 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']:

8
source/blender/windowmanager/intern/wm_apple.c
View 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__ */

10
source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
View 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}")

6
source/gameengine/BlenderRoutines/CMakeLists.txt
View 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}")

6
source/gameengine/Converter/CMakeLists.txt
View 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}")

6
source/gameengine/Expressions/CMakeLists.txt
View 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}")

8
source/gameengine/GameLogic/CMakeLists.txt
View 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}")

5
source/gameengine/GamePlayer/common/CMakeLists.txt
View 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}")

5
source/gameengine/GamePlayer/ghost/CMakeLists.txt
View 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}")

13
source/gameengine/Ketsji/CMakeLists.txt
View 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}")

6
source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
View 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}")

6
source/gameengine/Network/CMakeLists.txt
View 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}")

6
source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
View 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}")

5
source/gameengine/Physics/Bullet/CMakeLists.txt
View 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}")

6
source/gameengine/Physics/Dummy/CMakeLists.txt
View 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}")

6
source/gameengine/Physics/common/CMakeLists.txt
View 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}")

5
source/gameengine/Rasterizer/CMakeLists.txt
View 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}")

5
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
View 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}")

Some files were not shown because too many files have changed in this diff Show More