Revision: 38441
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38441
Author: campbellbarton
Date: 2011-07-16 23:01:14 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
cmake source definitions:
remove missing includes and use more strict formatting.
Modified Paths:
--------------
trunk/blender/extern/glew/CMakeLists.txt
trunk/blender/extern/lzo/CMakeLists.txt
trunk/blender/intern/audaspace/CMakeLists.txt
trunk/blender/intern/ghost/CMakeLists.txt
trunk/blender/intern/smoke/CMakeLists.txt
trunk/blender/source/blender/blenfont/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenlib/CMakeLists.txt
trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
trunk/blender/source/blender/editors/render/CMakeLists.txt
trunk/blender/source/blender/editors/space_script/CMakeLists.txt
trunk/blender/source/blender/editors/space_text/CMakeLists.txt
trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/nodes/CMakeLists.txt
trunk/blender/source/blender/python/intern/CMakeLists.txt
trunk/blender/source/blender/quicktime/CMakeLists.txt
trunk/blender/source/blender/render/CMakeLists.txt
trunk/blender/source/blender/windowmanager/CMakeLists.txt
trunk/blender/source/gameengine/GameLogic/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
Modified: trunk/blender/extern/glew/CMakeLists.txt
===================================================================
--- trunk/blender/extern/glew/CMakeLists.txt 2011-07-16 18:28:24 UTC (rev
38440)
+++ trunk/blender/extern/glew/CMakeLists.txt 2011-07-16 23:01:14 UTC (rev
38441)
@@ -33,7 +33,9 @@
)
if(UNIX)
- list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH})
+ list(APPEND INC_SYS
+ ${X11_X11_INCLUDE_PATH}
+ )
endif()
set(SRC
Modified: trunk/blender/extern/lzo/CMakeLists.txt
===================================================================
--- trunk/blender/extern/lzo/CMakeLists.txt 2011-07-16 18:28:24 UTC (rev
38440)
+++ trunk/blender/extern/lzo/CMakeLists.txt 2011-07-16 23:01:14 UTC (rev
38441)
@@ -25,7 +25,7 @@
# ***** END GPL LICENSE BLOCK *****
set(INC
- include
+
)
set(INC_SYS
Modified: trunk/blender/intern/audaspace/CMakeLists.txt
===================================================================
--- trunk/blender/intern/audaspace/CMakeLists.txt 2011-07-16 18:28:24 UTC
(rev 38440)
+++ trunk/blender/intern/audaspace/CMakeLists.txt 2011-07-16 23:01:14 UTC
(rev 38441)
@@ -159,8 +159,12 @@
if(WITH_CODEC_FFMPEG)
add_definitions(-DWITH_FFMPEG)
- list(APPEND INC ffmpeg)
- list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
+ list(APPEND INC
+ ffmpeg
+ )
+ list(APPEND INC_SYS
+ ${FFMPEG_INCLUDE_DIRS}
+ )
list(APPEND SRC
ffmpeg/AUD_FFMPEGFactory.cpp
ffmpeg/AUD_FFMPEGReader.cpp
@@ -172,8 +176,12 @@
if(WITH_SDL)
add_definitions(-DWITH_SDL)
- list(APPEND INC SDL)
- list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
+ list(APPEND INC
+ SDL
+ )
+ list(APPEND INC_SYS
+ ${SDL_INCLUDE_DIR}
+ )
list(APPEND SRC
SDL/AUD_SDLDevice.cpp
@@ -183,8 +191,12 @@
if(WITH_OPENAL)
add_definitions(-DWITH_OPENAL)
- list(APPEND INC OpenAL)
- list(APPEND INC_SYS ${OPENAL_INCLUDE_DIR})
+ list(APPEND INC
+ OpenAL
+ )
+ list(APPEND INC_SYS
+ ${OPENAL_INCLUDE_DIR}
+ )
list(APPEND SRC
OpenAL/AUD_OpenALDevice.cpp
@@ -194,8 +206,12 @@
if(WITH_JACK)
add_definitions(-DWITH_JACK)
- list(APPEND INC jack)
- list(APPEND INC_SYS ${JACK_INCLUDE_DIRS})
+ list(APPEND INC
+ jack
+ )
+ list(APPEND INC_SYS
+ ${JACK_INCLUDE_DIRS}
+ )
list(APPEND SRC
jack/AUD_JackDevice.cpp
@@ -205,8 +221,12 @@
if(WITH_CODEC_SNDFILE)
add_definitions(-DWITH_SNDFILE)
- list(APPEND INC sndfile)
- list(APPEND INC_SYS ${SNDFILE_INCLUDE_DIRS})
+ list(APPEND INC
+ sndfile
+ )
+ list(APPEND INC_SYS
+ ${SNDFILE_INCLUDE_DIRS}
+ )
list(APPEND SRC
sndfile/AUD_SndFileFactory.cpp
sndfile/AUD_SndFileReader.cpp
@@ -218,7 +238,9 @@
if(WITH_SAMPLERATE)
add_definitions(-DWITH_SAMPLERATE)
- list(APPEND INC_SYS ${SAMPLERATE_INCLUDE_DIRS})
+ list(APPEND INC_SYS
+ ${SAMPLERATE_INCLUDE_DIRS}
+ )
list(APPEND SRC
SRC/AUD_SRCResampleFactory.cpp
SRC/AUD_SRCResampleReader.cpp
@@ -230,8 +252,12 @@
if(WITH_FFTW3 AND FALSE)
add_definitions(-DWITH_FFTW3)
- list(APPEND INC fftw)
- list(APPEND INC_SYS ${FFTW3_INCLUDE_DIRS})
+ list(APPEND INC
+ fftw
+ )
+ list(APPEND INC_SYS
+ ${FFTW3_INCLUDE_DIRS}
+ )
list(APPEND SRC
fftw/AUD_BandPassFactory.cpp
fftw/AUD_BandPassReader.cpp
@@ -242,8 +268,12 @@
endif()
if(WITH_PYTHON)
- list(APPEND INC Python)
- list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+ list(APPEND INC
+ Python
+ )
+ list(APPEND INC_SYS
+ ${PYTHON_INCLUDE_DIRS}
+ )
list(APPEND SRC
Python/AUD_PyAPI.cpp
Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt 2011-07-16 18:28:24 UTC (rev
38440)
+++ trunk/blender/intern/ghost/CMakeLists.txt 2011-07-16 23:01:14 UTC (rev
38441)
@@ -146,7 +146,9 @@
)
endif()
- list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
+ list(APPEND INC_SYS
+ ${SDL_INCLUDE_DIR}
+ )
elseif(APPLE)
if(WITH_COCOA)
@@ -185,7 +187,9 @@
add_definitions(-DWITH_X11_XINPUT)
endif()
- list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH})
+ list(APPEND INC_SYS
+ ${X11_X11_INCLUDE_PATH}
+ )
list(APPEND SRC
intern/GHOST_DisplayManagerX11.cpp
@@ -205,7 +209,9 @@
if(X11_XF86keysym_INCLUDE_PATH)
add_definitions(-DWITH_XF86KEYSYM)
- list(APPEND INC_SYS ${X11_XF86keysym_INCLUDE_PATH})
+ list(APPEND INC_SYS
+ ${X11_XF86keysym_INCLUDE_PATH}
+ )
endif()
elseif(WIN32)
@@ -213,7 +219,9 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
endif()
- list(APPEND INC_SYS ${WINTAB_INC})
+ list(APPEND INC_SYS
+ ${WINTAB_INC}
+ )
list(APPEND SRC
intern/GHOST_DisplayManagerWin32.cpp
Modified: trunk/blender/intern/smoke/CMakeLists.txt
===================================================================
--- trunk/blender/intern/smoke/CMakeLists.txt 2011-07-16 18:28:24 UTC (rev
38440)
+++ trunk/blender/intern/smoke/CMakeLists.txt 2011-07-16 23:01:14 UTC (rev
38441)
@@ -89,7 +89,9 @@
if(WITH_FFTW3)
add_definitions(-DFFTW3=1)
- list(APPEND INC ${FFTW3_INCLUDE_DIRS})
+ list(APPEND INC
+ ${FFTW3_INCLUDE_DIRS}
+ )
endif()
blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/blenfont/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenfont/CMakeLists.txt 2011-07-16
18:28:24 UTC (rev 38440)
+++ trunk/blender/source/blender/blenfont/CMakeLists.txt 2011-07-16
23:01:14 UTC (rev 38441)
@@ -50,7 +50,9 @@
)
if(WITH_INTERNATIONAL)
- list(APPEND INC_SYS ${GETTEXT_INC})
+ list(APPEND INC_SYS
+ ${GETTEXT_INC}
+ )
add_definitions(-DINTERNATIONAL)
endif()
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-07-16
18:28:24 UTC (rev 38440)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-07-16
23:01:14 UTC (rev 38441)
@@ -32,8 +32,10 @@
set(INC
.
../avi
+ ../blenfont
../blenlib
../blenloader
+ ../editors/include
../gpu
../ikplugin
../imbuf
@@ -41,18 +43,19 @@
../makesrna
../modifiers
../nodes
- ../editors/include
../render/extern/include
- ../../../intern/bsp/extern ../blenfont
+ ../../../intern/bsp/extern
../../../intern/decimation/extern
../../../intern/elbeem/extern
../../../intern/guardedalloc
../../../intern/iksolver/extern
../../../intern/memutil
+ ../../../intern/mikktspace
../../../intern/opennl/extern
../../../intern/smoke/extern
- ../../../intern/mikktspace
- ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
+
+ # XXX - BAD LEVEL CALL WM_api.h
+ ../../../source/blender/windowmanager
)
set(INC_SYS
@@ -243,12 +246,16 @@
endif()
if(WITH_BULLET)
- list(APPEND INC ../../../extern/bullet2/src)
+ list(APPEND INC
+ ../../../extern/bullet2/src
+ )
add_definitions(-DUSE_BULLET)
endif()
if(WITH_MOD_CLOTH_ELTOPO)
- list(APPEND INC ../../../extern/eltopo)
+ list(APPEND INC
+ ../../../extern/eltopo
+ )
add_definitions(-DWITH_ELTOPO)
endif()
@@ -277,20 +284,32 @@
endif()
if(WITH_CODEC_QUICKTIME)
- list(APPEND INC ../quicktime)
- list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+ list(APPEND INC
+ ../quicktime
+ )
+ list(APPEND INC_SYS
+ ${QUICKTIME_INCLUDE_DIRS}
+ )
add_definitions(-DWITH_QUICKTIME)
endif()
if(WITH_CODEC_FFMPEG)
- list(APPEND INC ../../../intern/ffmpeg)
- list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
+ list(APPEND INC
+ ../../../intern/ffmpeg
+ )
+ list(APPEND INC_SYS
+ ${FFMPEG_INCLUDE_DIRS}
+ )
add_definitions(-DWITH_FFMPEG)
endif()
if(WITH_PYTHON)
- list(APPEND INC ../python)
- list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+ list(APPEND INC
+ ../python
+ )
+ list(APPEND INC_SYS
+ ${PYTHON_INCLUDE_DIRS}
+ )
add_definitions(-DWITH_PYTHON)
if(WITH_PYTHON_SECURITY)
@@ -315,12 +334,16 @@
endif()
if(WITH_LZO)
- list(APPEND INC_SYS ../../../extern/lzo/minilzo)
+ list(APPEND INC_SYS
+ ../../../extern/lzo/minilzo
+ )
add_definitions(-DWITH_LZO)
endif()
if(WITH_LZMA)
- list(APPEND INC_SYS ../../../extern/lzma)
+ list(APPEND INC_SYS
+ ../../../extern/lzma
+ )
add_definitions(-DWITH_LZMA)
endif()
Modified: trunk/blender/source/blender/blenlib/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenlib/CMakeLists.txt 2011-07-16 18:28:24 UTC
(rev 38440)
+++ trunk/blender/source/blender/blenlib/CMakeLists.txt 2011-07-16 23:01:14 UTC
(rev 38441)
@@ -138,7 +138,9 @@
)
if(WITH_BINRELOC)
- list(APPEND INC_SYS "${BINRELOC_INCLUDE_DIRS}")
+ list(APPEND INC_SYS
+ ${BINRELOC_INCLUDE_DIRS}
+ )
add_definitions(-DWITH_BINRELOC)
endif()
Modified: trunk/blender/source/blender/blenpluginapi/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenpluginapi/CMakeLists.txt 2011-07-16
18:28:24 UTC (rev 38440)
+++ trunk/blender/source/blender/blenpluginapi/CMakeLists.txt 2011-07-16
23:01:14 UTC (rev 38441)
@@ -50,7 +50,9 @@
)
if(WITH_CODEC_QUICKTIME)
- list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+ list(APPEND INC_SYS
+ ${QUICKTIME_INCLUDE_DIRS}
+ )
add_definitions(-DWITH_QUICKTIME)
endif()
Modified: trunk/blender/source/blender/editors/render/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/render/CMakeLists.txt 2011-07-16
18:28:24 UTC (rev 38440)
+++ trunk/blender/source/blender/editors/render/CMakeLists.txt 2011-07-16
23:01:14 UTC (rev 38441)
@@ -51,8 +51,12 @@
)
if(WITH_CODEC_QUICKTIME)
- list(APPEND INC ../../quicktime)
- list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+ list(APPEND INC
+ ../../quicktime
+ )
+ list(APPEND INC_SYS
+ ${QUICKTIME_INCLUDE_DIRS}
+ )
add_definitions(-DWITH_QUICKTIME)
endif()
Modified: trunk/blender/source/blender/editors/space_script/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_script/CMakeLists.txt
2011-07-16 18:28:24 UTC (rev 38440)
+++ trunk/blender/source/blender/editors/space_script/CMakeLists.txt
2011-07-16 23:01:14 UTC (rev 38441)
@@ -44,8 +44,12 @@
)
if(WITH_PYTHON)
- list(APPEND INC ../../python)
- list(APPEND INC_SYS ${PYTHON_INCLUDE_DIRS})
+ list(APPEND INC
+ ../../python
+ )
+ list(APPEND INC_SYS
+ ${PYTHON_INCLUDE_DIRS}
+ )
add_definitions(-DWITH_PYTHON)
endif()
Modified: trunk/blender/source/blender/editors/space_text/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_text/CMakeLists.txt
2011-07-16 18:28:24 UTC (rev 38440)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
