cmake source definitions:
authorCampbell Barton <ideasman42@gmail.com>
Sat, 16 Jul 2011 23:01:14 +0000 (23:01 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 16 Jul 2011 23:01:14 +0000 (23:01 +0000)
  remove missing includes and use more strict formatting.

25 files changed:
extern/glew/CMakeLists.txt
extern/lzo/CMakeLists.txt
intern/audaspace/CMakeLists.txt
intern/ghost/CMakeLists.txt
intern/smoke/CMakeLists.txt
source/blender/blenfont/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/CMakeLists.txt
source/blender/blenpluginapi/CMakeLists.txt
source/blender/editors/render/CMakeLists.txt
source/blender/editors/space_script/CMakeLists.txt
source/blender/editors/space_text/CMakeLists.txt
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/imbuf/CMakeLists.txt
source/blender/imbuf/intern/dds/CMakeLists.txt
source/blender/imbuf/intern/openexr/CMakeLists.txt
source/blender/makesrna/intern/CMakeLists.txt
source/blender/modifiers/CMakeLists.txt
source/blender/nodes/CMakeLists.txt
source/blender/python/intern/CMakeLists.txt
source/blender/quicktime/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/windowmanager/CMakeLists.txt
source/gameengine/GameLogic/CMakeLists.txt
source/gameengine/Ketsji/CMakeLists.txt

index 35beaca..a7ebe36 100644 (file)
@@ -33,7 +33,9 @@ set(INC_SYS
 )
 
 if(UNIX)
-       list(APPEND INC_SYS ${X11_X11_INCLUDE_PATH})
+       list(APPEND INC_SYS
+               ${X11_X11_INCLUDE_PATH}
+       )
 endif()
 
 set(SRC
index 10ea2c5..11eb185 100644 (file)
@@ -25,7 +25,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-       include
+
 )
 
 set(INC_SYS
index ab88c9e..73ad009 100644 (file)
@@ -159,8 +159,12 @@ set(SRC
 
 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 @@ endif()
 
 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 @@ endif()
 
 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 @@ endif()
 
 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 @@ endif()
 
 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 @@ endif()
 
 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 @@ endif()
 
 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 @@ if(WITH_FFTW3 AND FALSE)
 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
 
index 41c70b7..f49d075 100644 (file)
@@ -146,7 +146,9 @@ if(WITH_HEADLESS OR WITH_GHOST_SDL)
                )
        endif()
 
-       list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
+       list(APPEND INC_SYS
+               ${SDL_INCLUDE_DIR}
+       )
 
 elseif(APPLE)
        if(WITH_COCOA)
@@ -185,7 +187,9 @@ elseif(UNIX)
                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 @@ elseif(UNIX)
 
        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 @@ elseif(WIN32)
                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
index 174ee8b..094d398 100644 (file)
@@ -89,7 +89,9 @@ endif()
 
 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}")
index b915764..0258a41 100644 (file)
@@ -50,7 +50,9 @@ set(SRC
 )
 
 if(WITH_INTERNATIONAL)
-       list(APPEND INC_SYS ${GETTEXT_INC})
+       list(APPEND INC_SYS
+               ${GETTEXT_INC}
+       )
        add_definitions(-DINTERNATIONAL)
 endif()
 
index 92c5024..a3c3357 100644 (file)
@@ -32,8 +32,10 @@ endif()
 set(INC 
        .
        ../avi
+       ../blenfont
        ../blenlib
        ../blenloader
+       ../editors/include
        ../gpu
        ../ikplugin
        ../imbuf
@@ -41,18 +43,19 @@ set(INC
        ../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 @@ if(WITH_AUDASPACE)
 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 @@ if(WITH_IMAGE_HDR)
 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 @@ if(WITH_JACK)
 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()
 
index 2e05ac7..de7695b 100644 (file)
@@ -138,7 +138,9 @@ set(SRC
 )
 
 if(WITH_BINRELOC)
-       list(APPEND INC_SYS "${BINRELOC_INCLUDE_DIRS}")
+       list(APPEND INC_SYS
+               ${BINRELOC_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_BINRELOC)
 endif()
 
index a5af15d..193e401 100644 (file)
@@ -50,7 +50,9 @@ set(SRC
 )
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+       list(APPEND INC_SYS
+               ${QUICKTIME_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
index 7e49720..cf6c429 100644 (file)
@@ -51,8 +51,12 @@ set(SRC
 )
 
 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()
 
index 1aed177..1884852 100644 (file)
@@ -44,8 +44,12 @@ set(SRC
 )
 
 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()
 
index 0c17422..145da6c 100644 (file)
@@ -46,8 +46,12 @@ set(SRC
 )
 
 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()
 
index 0a12a28..e83e51a 100644 (file)
@@ -61,7 +61,9 @@ set(SRC
 )
 
 if(WITH_GAMEENGINE)
-       list(APPEND INC ../../../../source/gameengine/BlenderRoutines)
+       list(APPEND INC
+               ../../../../source/gameengine/BlenderRoutines
+       )
        add_definitions(-DWITH_GAMEENGINE)
 endif()
 
index c9a8f62..1517432 100644 (file)
@@ -113,29 +113,43 @@ if(WITH_IMAGE_OPENEXR)
 endif()
 
 if(WITH_IMAGE_TIFF)
-       list(APPEND INC_SYS ${TIFF_INCLUDE_DIR})
+       list(APPEND INC_SYS
+               ${TIFF_INCLUDE_DIR}
+       )
        add_definitions(-DWITH_TIFF)
 endif()
 
 if(WITH_IMAGE_OPENJPEG)
-       list(APPEND INC_SYS ${OPENJPEG_INCLUDE_DIRS})
+       list(APPEND INC_SYS
+               ${OPENJPEG_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_OPENJPEG)
 endif()
 
 if(WITH_IMAGE_REDCODE)
-       list(APPEND INC_SYS ${REDCODE_INC})
+       list(APPEND INC_SYS
+               ${REDCODE_INC}
+       )
        add_definitions(-DWITH_REDCODE)
 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()
 
index fd2b945..db3c85d 100644 (file)
@@ -28,7 +28,6 @@ set(INC
        .
        ..
        ../..
-       intern/include
        ../../../blenlib
        ../../../blenkernel
        ../../../makesdna
index 9ca4dff..ca638b8 100644 (file)
@@ -30,7 +30,6 @@ set(INC
        ../..
        ../../../blenkernel
        ../../../blenlib
-       intern/include
        ../../../../../intern/guardedalloc
        ../../../makesdna
 )
@@ -44,7 +43,9 @@ set(SRC
 )
 
 if(WITH_IMAGE_OPENEXR)
-       list(APPEND INC_SYS ${OPENEXR_INCLUDE_DIRS})
+       list(APPEND INC_SYS
+               ${OPENEXR_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_OPENEXR)
 endif()
 
index 1db2985..c9865bf 100644 (file)
@@ -176,12 +176,16 @@ if(WITH_AUDASPACE)
 endif()
 
 if(WITH_CODEC_QUICKTIME)
-       list(APPEND INC ../../quicktime)
+       list(APPEND INC
+               ../../quicktime
+       )
        add_definitions(-DWITH_QUICKTIME)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-       list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
+       list(APPEND INC_SYS
+               ${FFMPEG_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_FFMPEG)
 endif()
 
index 348e2a0..ba5a7ac 100644 (file)
@@ -25,7 +25,8 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC 
-       . ./intern
+       .
+       ./intern
        ../blenlib
        ../blenloader
        ../makesdna
@@ -98,7 +99,9 @@ endif()
 
 if(WITH_MOD_DECIMATE)
        add_definitions(-DWITH_MOD_DECIMATE)
-       list(APPEND INC ../../../intern/decimation/extern)
+       list(APPEND INC
+               ../../../intern/decimation/extern
+       )
 endif()
 
 if(NOT WITH_MOD_FLUID)
index d2b58d6..c3bd37c 100644 (file)
@@ -152,8 +152,12 @@ set(SRC
 )
 
 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()
 
index 287ba45..a1eb958 100644 (file)
@@ -88,9 +88,6 @@ if(WITH_PYTHON_SAFETY)
 endif()
 
 if(WITH_AUDASPACE)
-       list(APPEND INC
-               ../../../intern/audaspace/intern
-       )
        add_definitions(-DWITH_AUDASPACE)
 endif()
 
index 6ce4954..6e72f05 100644 (file)
 
 set(INC 
        .
-       ../quicktime
-       ../makesdna
-       ../makesrna
-       ../blenlib
-       ../blenkernel
        ../avi
+       ../blenkernel
+       ../blenlib
+       ../blenloader
        ../imbuf
        ../imbuf/intern
-       ../blenloader
+       ../makesdna
+       ../makesrna
+       ../quicktime
        ../render/extern/include
-       ../include
        ../windowmanager
        ../../../intern/guardedalloc
 )
index 003f0b8..9adebff 100644 (file)
@@ -125,8 +125,12 @@ if(WITH_MOD_SMOKE)
 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()
 
index f9c1d80..c815b4a 100644 (file)
@@ -89,18 +89,26 @@ if(WITH_OPENCOLLADA)
 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_SYS ${FFMPEG_INCLUDE_DIRS})
+       list(APPEND INC_SYS
+               ${FFMPEG_INCLUDE_DIRS}
+       )
        add_definitions(-DWITH_FFMPEG)
 endif()
 
 if(WITH_PYTHON)
-       list(APPEND INC ../python)
+       list(APPEND INC
+               ../python
+       )
        add_definitions(-DWITH_PYTHON)
 
        if(WITH_PYTHON_SECURITY)
index b672165..6e5d8b9 100644 (file)
@@ -128,7 +128,9 @@ set(SRC
 )
 
 if(WITH_SDL)
-       list(APPEND INC_SYS ${SDL_INCLUDE_DIR})
+       list(APPEND INC_SYS
+               ${SDL_INCLUDE_DIR}
+       )
 else()
        add_definitions(-DDISABLE_SDL)
 endif()
index 7b3906e..596a04f 100644 (file)
@@ -210,7 +210,9 @@ set(SRC
 add_definitions(-DGLEW_STATIC)
 
 if(WITH_SDL)
-       list(APPEND INC_SYS ${SDL_INCLUDE_DIR})  
+       list(APPEND INC_SYS
+               ${SDL_INCLUDE_DIR}
+       )
 else()
        add_definitions(-DDISABLE_SDL)
 endif()