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

- added back zlib include (needed for win32).

Browse Source 
- use list append in more places.
- remove non existing include dir.
This commit is contained in:
Campbell Barton
2010-09-07 01:13:10 +00:00
parent e0aca888de
commit 2406ebe1a4
34 changed files with 105 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -309,8 +309,8 @@ IF(UNIX AND NOT APPLE)
IF(WITH_OPENMP) IF(WITH_OPENMP)
LIST(APPEND LLIBS -lgomp) LIST(APPEND LLIBS -lgomp)
LIST(APPEND CMAKE_C_FLAGS -fopenmp) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
LIST(APPEND CMAKE_CXX_FLAGS -fopenmp) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
ENDIF(WITH_OPENMP) ENDIF(WITH_OPENMP)
@@ -401,8 +401,7 @@ IF(WIN32)
ENDIF(WITH_QUICKTIME) ENDIF(WITH_QUICKTIME)
IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
ADD_DEFINITIONS(-D__SSE__) ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
ADD_DEFINITIONS(-D__MMX__)
ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
IF(MSVC) IF(MSVC)
@@ -865,8 +864,7 @@ IF(WITH_RAYOPTIMIZATION)
IF(CMAKE_COMPILER_IS_GNUCC) IF(CMAKE_COMPILER_IS_GNUCC)
IF(SUPPORT_SSE_BUILD) IF(SUPPORT_SSE_BUILD)
SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}") SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
ADD_DEFINITIONS(-D__SSE__) ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
ADD_DEFINITIONS(-D__MMX__)
ENDIF(SUPPORT_SSE_BUILD) ENDIF(SUPPORT_SSE_BUILD)
IF(SUPPORT_SSE2_BUILD) IF(SUPPORT_SSE2_BUILD)
SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}") SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}")

3
extern/glew/CMakeLists.txt vendored
View File

@@ -27,7 +27,7 @@
SET(INC include src) SET(INC include src)
IF(UNIX) IF(UNIX)
SET(INC ${INC} ${X11_X11_INCLUDE_PATH}) LIST(APPEND INC ${X11_X11_INCLUDE_PATH})
ENDIF(UNIX) ENDIF(UNIX)
SET(SRC SET(SRC
@@ -37,4 +37,3 @@ SET(SRC
ADD_DEFINITIONS(-DGLEW_STATIC) ADD_DEFINITIONS(-DGLEW_STATIC)
BLENDERLIB(extern_glew "${SRC}" "${INC}") BLENDERLIB(extern_glew "${SRC}" "${INC}")

20
intern/audaspace/CMakeLists.txt
View File

@@ -36,49 +36,43 @@ FILE(GLOB SRC
) )
IF(WITH_FFMPEG) IF(WITH_FFMPEG)
LIST(APPEND INC ffmpeg) LIST(APPEND INC ffmpeg ${FFMPEG_INC})
LIST(APPEND INC ${FFMPEG_INC})
FILE(GLOB FFMPEGSRC ffmpeg/*.cpp) FILE(GLOB FFMPEGSRC ffmpeg/*.cpp)
ADD_DEFINITIONS(-DWITH_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG) ENDIF(WITH_FFMPEG)
IF(WITH_SDL) IF(WITH_SDL)
LIST(APPEND INC SDL) LIST(APPEND INC SDL ${SDL_INCLUDE_DIR})
LIST(APPEND INC ${SDL_INCLUDE_DIR})
FILE(GLOB SDLSRC SDL/*.cpp) FILE(GLOB SDLSRC SDL/*.cpp)
ADD_DEFINITIONS(-DWITH_SDL) ADD_DEFINITIONS(-DWITH_SDL)
ENDIF(WITH_SDL) ENDIF(WITH_SDL)
IF(WITH_OPENAL) IF(WITH_OPENAL)
LIST(APPEND INC OpenAL) LIST(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR})
LIST(APPEND INC ${OPENAL_INCLUDE_DIR})
FILE(GLOB OPENALSRC OpenAL/*.cpp) FILE(GLOB OPENALSRC OpenAL/*.cpp)
ADD_DEFINITIONS(-DWITH_OPENAL) ADD_DEFINITIONS(-DWITH_OPENAL)
ENDIF(WITH_OPENAL) ENDIF(WITH_OPENAL)
IF(WITH_JACK) IF(WITH_JACK)
LIST(APPEND INC jack) LIST(APPEND INC jack ${JACK_INC})
LIST(APPEND INC ${JACK_INC})
FILE(GLOB JACKSRC jack/*.cpp) FILE(GLOB JACKSRC jack/*.cpp)
ADD_DEFINITIONS(-DWITH_JACK) ADD_DEFINITIONS(-DWITH_JACK)
ENDIF(WITH_JACK) ENDIF(WITH_JACK)
IF(WITH_SNDFILE) IF(WITH_SNDFILE)
LIST(APPEND INC sndfile) LIST(APPEND INC sndfile ${SNDFILE_INC})
LIST(APPEND INC ${SNDFILE_INC})
FILE(GLOB SNDFILESRC sndfile/*.cpp) FILE(GLOB SNDFILESRC sndfile/*.cpp)
ADD_DEFINITIONS(-DWITH_SNDFILE) ADD_DEFINITIONS(-DWITH_SNDFILE)
ENDIF(WITH_SNDFILE) ENDIF(WITH_SNDFILE)
#IF(WITH_FFTW3) #IF(WITH_FFTW3)
# SET(INC ${INC} fftw ${FFTW3_INC}) # LIST(APPEND INC fftw ${FFTW3_INC})
# FILE(GLOB FFTW3SRC fftw/*.cpp) # FILE(GLOB FFTW3SRC fftw/*.cpp)
# ADD_DEFINITIONS(-DWITH_FFTW3) # ADD_DEFINITIONS(-DWITH_FFTW3)
#ENDIF(WITH_FFTW3) #ENDIF(WITH_FFTW3)
IF(WITH_PYTHON) IF(WITH_PYTHON)
LIST(APPEND INC Python) LIST(APPEND INC Python ${PYTHON_INC})
LIST(APPEND INC ${PYTHON_INC})
FILE(GLOB PYTHONSRC Python/*.cpp) FILE(GLOB PYTHONSRC Python/*.cpp)
ELSE(WITH_PYTHON) ELSE(WITH_PYTHON)
ADD_DEFINITIONS(-DDISABLE_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON)

12
intern/ghost/CMakeLists.txt
View File

@@ -52,13 +52,13 @@ SET(SRC
IF(APPLE) IF(APPLE)
IF(WITH_COCOA) IF(WITH_COCOA)
SET(SRC ${SRC} LIST(APPEND SRC
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCocoa.mm ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCocoa.mm
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCocoa.mm ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCocoa.mm
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCocoa.mm ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCocoa.mm
) )
ELSE(WITH_COCOA) ELSE(WITH_COCOA)
SET(SRC ${SRC} LIST(APPEND SRC
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp
@@ -69,18 +69,18 @@ IF(APPLE)
ADD_DEFINITIONS(-DWITH_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME) ENDIF(WITH_QUICKTIME)
ELSEIF(WIN32) ELSEIF(WIN32)
SET(INC ${INC} ${WINTAB_INC}) LIST(APPEND INC ${WINTAB_INC})
SET(SRC ${SRC} LIST(APPEND SRC
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DropTargetWin32.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DropTargetWin32.cpp
) )
ELSEIF(UNIX) ELSEIF(UNIX)
SET(INC ${INC} ${X11_X11_INCLUDE_PATH}) LIST(APPEND INC ${X11_X11_INCLUDE_PATH})
SET(SRC ${SRC} LIST(APPEND SRC
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerX11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp

14
intern/smoke/CMakeLists.txt
View File

@@ -24,7 +24,14 @@
# #
# ***** END GPL LICENSE BLOCK ***** # ***** END GPL LICENSE BLOCK *****
SET(INC ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc) SET(INC
intern
../memutil
../guardealloc
../../extern/bullet2/src
${PNG_INC}
${ZLIB_INC}
)
FILE(GLOB SRC intern/*.cpp) FILE(GLOB SRC intern/*.cpp)
@@ -34,9 +41,8 @@ ENDIF(WITH_OPENMP)
IF(WITH_FFTW3) IF(WITH_FFTW3)
ADD_DEFINITIONS(-DFFTW3=1) ADD_DEFINITIONS(-DFFTW3=1)
SET(INC ${INC} ${FFTW3_INC}) LIST(APPEND INC ${FFTW3_INC})
ENDIF(WITH_FFTW3) ENDIF(WITH_FFTW3)
BLENDERLIB(bf_intern_smoke "${SRC}" "${INC}") BLENDERLIB(bf_intern_smoke "${SRC}" "${INC}")
#, libtype='blender', priority = 0 )

6
source/blender/blenkernel/CMakeLists.txt
View File

@@ -87,8 +87,7 @@ IF(WITH_IMAGE_HDR)
ENDIF(WITH_IMAGE_HDR) ENDIF(WITH_IMAGE_HDR)
IF(WITH_QUICKTIME) IF(WITH_QUICKTIME)
LIST(APPEND INC ../quicktime) LIST(APPEND INC ../quicktime ${QUICKTIME_INC})
LIST(APPEND INC ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME) ENDIF(WITH_QUICKTIME)
@@ -103,8 +102,7 @@ IF(WITH_LCMS)
ENDIF(WITH_LCMS) ENDIF(WITH_LCMS)
IF(WITH_PYTHON) IF(WITH_PYTHON)
LIST(APPEND INC ../python) LIST(APPEND INC ../python ${PYTHON_INC})
LIST(APPEND INC ${PYTHON_INC})
ELSE(WITH_PYTHON) ELSE(WITH_PYTHON)
ADD_DEFINITIONS(-DDISABLE_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON)
ENDIF(WITH_PYTHON) ENDIF(WITH_PYTHON)

3
source/blender/blenlib/CMakeLists.txt
View File

@@ -34,6 +34,7 @@ SET(INC
../gpu ../gpu
../../../intern/ghost ../../../intern/ghost
../../../intern/guardedalloc ../../../intern/guardedalloc
${ZLIB_INC}
${FREETYPE_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS}
) )
@@ -45,7 +46,7 @@ SET(INC
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
IF(WITH_OPENMP) IF(WITH_OPENMP)

4
source/blender/blenpluginapi/CMakeLists.txt
View File

@@ -31,11 +31,11 @@ SET(INC
) )
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
IF(WITH_QUICKTIME) IF(WITH_QUICKTIME)
SET(INC ${INC} ${QUICKTIME_INC}) LIST(APPEND INC ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME) ENDIF(WITH_QUICKTIME)

2
source/blender/editors/armature/CMakeLists.txt
View File

@@ -33,7 +33,7 @@ SET(INC
) )
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
BLENDERLIB(bf_editor_armature "${SRC}" "${INC}") BLENDERLIB(bf_editor_armature "${SRC}" "${INC}")

2
source/blender/editors/mesh/CMakeLists.txt
View File

@@ -34,7 +34,7 @@ SET(INC
) )
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
BLENDERLIB(bf_editor_mesh "${SRC}" "${INC}") BLENDERLIB(bf_editor_mesh "${SRC}" "${INC}")

2
source/blender/editors/object/CMakeLists.txt
View File

@@ -41,7 +41,7 @@ IF(NOT WITH_PYTHON)
ENDIF(NOT WITH_PYTHON) ENDIF(NOT WITH_PYTHON)
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
BLENDERLIB(bf_editor_object "${SRC}" "${INC}") BLENDERLIB(bf_editor_object "${SRC}" "${INC}")

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

@@ -41,7 +41,7 @@ IF(WITH_OPENMP)
ENDIF(WITH_OPENMP) ENDIF(WITH_OPENMP)
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
BLENDERLIB(bf_editor_physics "${SRC}" "${INC}") BLENDERLIB(bf_editor_physics "${SRC}" "${INC}")

2
source/blender/editors/render/CMakeLists.txt
View File

@@ -48,7 +48,7 @@ IF(WITH_OPENMP)
ENDIF(WITH_OPENMP) ENDIF(WITH_OPENMP)
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
BLENDERLIB(bf_editor_render "${SRC}" "${INC}") BLENDERLIB(bf_editor_render "${SRC}" "${INC}")

2
source/blender/editors/screen/CMakeLists.txt
View File

@@ -34,7 +34,7 @@ SET(INC
) )
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
BLENDERLIB(bf_editor_screen "${SRC}" "${INC}") BLENDERLIB(bf_editor_screen "${SRC}" "${INC}")

2
source/blender/editors/sculpt_paint/CMakeLists.txt
View File

@@ -35,7 +35,7 @@ SET(INC
) )
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
BLENDERLIB(bf_editor_sculpt_paint "${SRC}" "${INC}") BLENDERLIB(bf_editor_sculpt_paint "${SRC}" "${INC}")

2
source/blender/editors/space_file/CMakeLists.txt
View File

@@ -61,7 +61,7 @@ IF(WITH_IMAGE_HDR)
ENDIF(WITH_IMAGE_HDR) ENDIF(WITH_IMAGE_HDR)
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
BLENDERLIB(bf_editor_space_file "${SRC}" "${INC}") BLENDERLIB(bf_editor_space_file "${SRC}" "${INC}")

2
source/blender/editors/space_image/CMakeLists.txt
View File

@@ -47,7 +47,7 @@ IF(WITH_LCMS)
ENDIF(WITH_LCMS) ENDIF(WITH_LCMS)
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
BLENDERLIB(bf_editor_space_image "${SRC}" "${INC}") BLENDERLIB(bf_editor_space_image "${SRC}" "${INC}")

2
source/blender/editors/space_node/CMakeLists.txt
View File

@@ -36,7 +36,7 @@ SET(INC
) )
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
BLENDERLIB(bf_editor_space_node "${SRC}" "${INC}") BLENDERLIB(bf_editor_space_node "${SRC}" "${INC}")

2
source/blender/editors/space_view3d/CMakeLists.txt
View File

@@ -42,7 +42,7 @@ IF(WITH_GAMEENGINE)
ENDIF(WITH_GAMEENGINE) ENDIF(WITH_GAMEENGINE)
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
ADD_DEFINITIONS(-DGLEW_STATIC) ADD_DEFINITIONS(-DGLEW_STATIC)

2
source/blender/imbuf/CMakeLists.txt
View File

@@ -41,7 +41,7 @@ SET(INC
) )
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
IF(WITH_IMAGE_OPENEXR) IF(WITH_IMAGE_OPENEXR)

8
source/blender/makesrna/intern/CMakeLists.txt
View File

@@ -63,7 +63,7 @@ IF(NOT WITH_PYTHON)
ENDIF(NOT WITH_PYTHON) ENDIF(NOT WITH_PYTHON)
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
IF(WITH_GAMEENGINE) IF(WITH_GAMEENGINE)
@@ -95,17 +95,17 @@ IF(WITH_IMAGE_HDR)
ENDIF(WITH_IMAGE_HDR) ENDIF(WITH_IMAGE_HDR)
IF(WITH_QUICKTIME) IF(WITH_QUICKTIME)
SET(INC ${INC} ../../quicktime) LIST(APPEND INC ../../quicktime)
ADD_DEFINITIONS(-DWITH_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME) ENDIF(WITH_QUICKTIME)
IF(WITH_FFMPEG) IF(WITH_FFMPEG)
SET(INC ${INC} ${FFMPEG_INC}) LIST(APPEND INC ${FFMPEG_INC})
ADD_DEFINITIONS(-DWITH_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG) ENDIF(WITH_FFMPEG)
IF(WITH_LCMS) IF(WITH_LCMS)
SET(INC ${INC} ${LCMS_INCLUDE_DIR}) LIST(APPEND INC ${LCMS_INCLUDE_DIR})
ADD_DEFINITIONS(-DWITH_LCMS) ADD_DEFINITIONS(-DWITH_LCMS)
ENDIF(WITH_LCMS) ENDIF(WITH_LCMS)

2
source/blender/nodes/CMakeLists.txt
View File

@@ -40,7 +40,7 @@ SET(INC
) )
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
IF(WITH_PYTHON) IF(WITH_PYTHON)

1
source/blender/python/CMakeLists.txt
View File

@@ -46,4 +46,3 @@ IF(WITH_BUILDINFO)
ENDIF(WITH_BUILDINFO) ENDIF(WITH_BUILDINFO)
BLENDERLIB(bf_python "${SRC}" "${INC}") BLENDERLIB(bf_python "${SRC}" "${INC}")

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

@@ -35,7 +35,6 @@ SET(INC
../quicktime ../quicktime
../makesdna ../makesdna
../makesrna ../makesrna
../../../intern/guardedalloc
../blenlib ../blenlib
../blenkernel ../blenkernel
../avi ../avi
@@ -46,9 +45,10 @@ SET(INC
../include ../include
../windowmanager ../windowmanager
../../../intern/audaspace/intern ../../../intern/audaspace/intern
../../../intern/guardedalloc
${QUICKTIME_INC}
) )
SET(INC ${INC} ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME)
BLENDERLIB(bf_quicktime "${SRC}" "${INC}") BLENDERLIB(bf_quicktime "${SRC}" "${INC}")

23
source/blender/render/CMakeLists.txt
View File

@@ -27,15 +27,22 @@
FILE(GLOB SRC intern/source/*.c intern/raytrace/*.cpp) FILE(GLOB SRC intern/source/*.c intern/raytrace/*.cpp)
SET(INC SET(INC
intern/include ../../../intern/guardedalloc ../blenlib ../makesdna intern/include
extern/include ../blenkernel ../imbuf extern/include
../include ../../kernel/gen_messaging ../blenloader ../blenlib
../../../intern/smoke/extern ../blenloader
../makesdna
../makesrna ../makesrna
../blenkernel
../imbuf
../include
../../kernel/gen_messaging
../../../intern/smoke/extern
../../../intern/guardedalloc
) )
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
IF(WITH_IMAGE_OPENEXR) IF(WITH_IMAGE_OPENEXR)
@@ -43,14 +50,14 @@ IF(WITH_IMAGE_OPENEXR)
ENDIF(WITH_IMAGE_OPENEXR) ENDIF(WITH_IMAGE_OPENEXR)
IF(WITH_QUICKTIME) IF(WITH_QUICKTIME)
SET(INC ${INC} ../quicktime ${QUICKTIME_INC}) LIST(APPEND INC ../quicktime ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME) ENDIF(WITH_QUICKTIME)
IF(APPLE) IF(APPLE)
IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse") LIST(APPEND CMAKE_C_FLAGS_RELEASE -mfpmath=sse)
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse") LIST(APPEND CMAKE_CXX_FLAGS_RELEASE -mfpmath=sse)
ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
ENDIF(APPLE) ENDIF(APPLE)

35
source/blender/windowmanager/CMakeLists.txt
View File

@@ -26,18 +26,27 @@
FILE(GLOB SRC intern/*.c) FILE(GLOB SRC intern/*.c)
SET(INC . SET(INC
../editors/include .
../../../intern/guardedalloc ../../../intern/memutil
../blenlib ../makesdna ../makesrna ../blenkernel
../include ../imbuf ../render/extern/include
../blenloader
../../kernel/gen_system ../readstreamglue
../../../intern/elbeem/extern
../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
../nodes ../nodes
../gpu ../gpu
../blenfont ../blenfont
../blenlib
../makesdna
../makesrna
../blenkernel
../include
../imbuf
../blenloader
../editors/include
../render/extern/include
../../kernel/gen_system
../../../intern/guardedalloc
../../../intern/memutil
../../../intern/elbeem/extern
../../../intern/ghost
../../../intern/opennl/extern
../../../extern/glew/include
${OPENGL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}
) )
@@ -52,23 +61,23 @@ IF(WITH_OPENCOLLADA)
ENDIF(WITH_OPENCOLLADA) ENDIF(WITH_OPENCOLLADA)
IF(WITH_QUICKTIME) IF(WITH_QUICKTIME)
SET(INC ${INC} ../quicktime ${QUICKTIME_INC}) LIST(APPEND INC ../quicktime ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME)
ENDIF(WITH_QUICKTIME) ENDIF(WITH_QUICKTIME)
IF(WITH_FFMPEG) IF(WITH_FFMPEG)
SET(INC ${INC} ${FFMPEG_INC}) LIST(APPEND INC ${FFMPEG_INC})
ADD_DEFINITIONS(-DWITH_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG) ENDIF(WITH_FFMPEG)
IF(WITH_PYTHON) IF(WITH_PYTHON)
SET(INC ${INC} ../python ${PYTHON_INC}) LIST(APPEND INC ../python ${PYTHON_INC})
ELSE(WITH_PYTHON) ELSE(WITH_PYTHON)
ADD_DEFINITIONS(-DDISABLE_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON)
ENDIF(WITH_PYTHON) ENDIF(WITH_PYTHON)
IF(WIN32) IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC}) LIST(APPEND INC ${PTHREADS_INC})
ENDIF(WIN32) ENDIF(WIN32)
IF(WITH_COCOA) IF(WITH_COCOA)

14
source/creator/CMakeLists.txt
View File

@@ -95,12 +95,14 @@ IF(WIN32)
ENDIF(WIN32) ENDIF(WIN32)
IF(WITH_BUILDINFO) IF(WITH_BUILDINFO)
ADD_DEFINITIONS(-DBUILD_DATE="${BUILD_DATE}") ADD_DEFINITIONS(
ADD_DEFINITIONS(-DBUILD_TIME="${BUILD_TIME}") -DBUILD_DATE="${BUILD_DATE}"
ADD_DEFINITIONS(-DBUILD_REV="${BUILD_REV}") -DBUILD_TIME="${BUILD_TIME}"
ADD_DEFINITIONS(-DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}") -DBUILD_REV="${BUILD_REV}"
ADD_DEFINITIONS(-DBUILD_TYPE="${CMAKE_BUILD_TYPE}") -DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}"
-DBUILD_TYPE="${CMAKE_BUILD_TYPE}"
)
LIST(APPEND EXESRC buildinfo.c) LIST(APPEND EXESRC buildinfo.c)
ENDIF(WITH_BUILDINFO) ENDIF(WITH_BUILDINFO)

2
source/gameengine/BlenderRoutines/CMakeLists.txt
View File

@@ -44,7 +44,7 @@ IF(WITH_FFMPEG)
ENDIF(WITH_FFMPEG) ENDIF(WITH_FFMPEG)
IF(WITH_PYTHON) IF(WITH_PYTHON)
SET(INC ${INC} ${PYTHON_INC}) LIST(APPEND INC ${PYTHON_INC})
ELSE(WITH_PYTHON) ELSE(WITH_PYTHON)
ADD_DEFINITIONS(-DDISABLE_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON)
ENDIF(WITH_PYTHON) ENDIF(WITH_PYTHON)

2
source/gameengine/Converter/CMakeLists.txt
View File

@@ -64,7 +64,7 @@ SET(INC
) )
IF(WITH_PYTHON) IF(WITH_PYTHON)
SET(INC ${INC} ${PYTHON_INC}) LIST(APPEND INC ${PYTHON_INC})
ELSE(WITH_PYTHON) ELSE(WITH_PYTHON)
ADD_DEFINITIONS(-DDISABLE_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON)
ENDIF(WITH_PYTHON) ENDIF(WITH_PYTHON)

2
source/gameengine/Expressions/CMakeLists.txt
View File

@@ -37,7 +37,7 @@ SET(INC
) )
IF(WITH_PYTHON) IF(WITH_PYTHON)
SET(INC ${INC} ${PYTHON_INC}) LIST(APPEND INC ${PYTHON_INC})
ELSE(WITH_PYTHON) ELSE(WITH_PYTHON)
ADD_DEFINITIONS(-DDISABLE_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON)
ENDIF(WITH_PYTHON) ENDIF(WITH_PYTHON)

2
source/gameengine/GameLogic/CMakeLists.txt
View File

@@ -43,7 +43,7 @@ ELSE(WITH_SDL)
ENDIF(WITH_SDL) ENDIF(WITH_SDL)
IF(WITH_PYTHON) IF(WITH_PYTHON)
SET(INC ${INC} ${PYTHON_INC}) LIST(APPEND INC ${PYTHON_INC})
ELSE(WITH_PYTHON) ELSE(WITH_PYTHON)
ADD_DEFINITIONS(-DDISABLE_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON)
ENDIF(WITH_PYTHON) ENDIF(WITH_PYTHON)

2
source/gameengine/Ketsji/CMakeLists.txt
View File

@@ -70,7 +70,7 @@ ELSE(WITH_SDL)
ENDIF(WITH_SDL) ENDIF(WITH_SDL)
IF(WITH_PYTHON) IF(WITH_PYTHON)
SET(INC ${INC} ${PYTHON_INC}) LIST(APPEND INC ${PYTHON_INC})
ELSE(WITH_PYTHON) ELSE(WITH_PYTHON)
ADD_DEFINITIONS(-DDISABLE_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON)
ENDIF(WITH_PYTHON) ENDIF(WITH_PYTHON)

2
source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
View File

@@ -39,7 +39,7 @@ SET(INC
) )
IF(WITH_PYTHON) IF(WITH_PYTHON)
SET(INC ${INC} ${PYTHON_INC}) LIST(APPEND INC ${PYTHON_INC})
ELSE(WITH_PYTHON) ELSE(WITH_PYTHON)
ADD_DEFINITIONS(-DDISABLE_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON)
ENDIF(WITH_PYTHON) ENDIF(WITH_PYTHON)

2
source/gameengine/VideoTexture/CMakeLists.txt
View File

@@ -58,7 +58,7 @@ IF(WITH_FFMPEG)
ENDIF(WITH_FFMPEG) ENDIF(WITH_FFMPEG)
IF(WITH_PYTHON) IF(WITH_PYTHON)
SET(INC ${INC} ${PYTHON_INC}) LIST(APPEND INC ${PYTHON_INC})
ELSE(WITH_PYTHON) ELSE(WITH_PYTHON)
ADD_DEFINITIONS(-DDISABLE_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON)
ENDIF(WITH_PYTHON) ENDIF(WITH_PYTHON)