- added back zlib include (needed for win32).
authorCampbell Barton <ideasman42@gmail.com>
Tue, 7 Sep 2010 01:13:10 +0000 (01:13 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 7 Sep 2010 01:13:10 +0000 (01:13 +0000)
- use list append in more places.
- remove non existing include dir.

34 files changed:
CMakeLists.txt
extern/glew/CMakeLists.txt
intern/audaspace/CMakeLists.txt
intern/ghost/CMakeLists.txt
intern/smoke/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/CMakeLists.txt
source/blender/blenpluginapi/CMakeLists.txt
source/blender/editors/armature/CMakeLists.txt
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/object/CMakeLists.txt
source/blender/editors/physics/CMakeLists.txt
source/blender/editors/render/CMakeLists.txt
source/blender/editors/screen/CMakeLists.txt
source/blender/editors/sculpt_paint/CMakeLists.txt
source/blender/editors/space_file/CMakeLists.txt
source/blender/editors/space_image/CMakeLists.txt
source/blender/editors/space_node/CMakeLists.txt
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/imbuf/CMakeLists.txt
source/blender/makesrna/intern/CMakeLists.txt
source/blender/nodes/CMakeLists.txt
source/blender/python/CMakeLists.txt
source/blender/quicktime/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/windowmanager/CMakeLists.txt
source/creator/CMakeLists.txt
source/gameengine/BlenderRoutines/CMakeLists.txt
source/gameengine/Converter/CMakeLists.txt
source/gameengine/Expressions/CMakeLists.txt
source/gameengine/GameLogic/CMakeLists.txt
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
source/gameengine/VideoTexture/CMakeLists.txt

index 0ca96fc8dc8dded74bb066e5e2b8496f57ab1cd3..4fdc6b9ebf6911e9c3f0e6647a0c46b05bef0a44 100644 (file)
@@ -309,8 +309,8 @@ IF(UNIX AND NOT APPLE)
 
        IF(WITH_OPENMP)
                LIST(APPEND LLIBS -lgomp)
-               LIST(APPEND CMAKE_C_FLAGS -fopenmp)
-               LIST(APPEND CMAKE_CXX_FLAGS -fopenmp)
+               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+               SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
        ENDIF(WITH_OPENMP)
 
 
@@ -401,8 +401,7 @@ IF(WIN32)
        ENDIF(WITH_QUICKTIME)
 
        IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
-               ADD_DEFINITIONS(-D__SSE__)
-               ADD_DEFINITIONS(-D__MMX__)
+               ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
        ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
 
        IF(MSVC)
@@ -865,8 +864,7 @@ IF(WITH_RAYOPTIMIZATION)
        IF(CMAKE_COMPILER_IS_GNUCC)
                IF(SUPPORT_SSE_BUILD)
                        SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
-                       ADD_DEFINITIONS(-D__SSE__)
-                       ADD_DEFINITIONS(-D__MMX__)
+                       ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
                ENDIF(SUPPORT_SSE_BUILD)
                IF(SUPPORT_SSE2_BUILD)
                        SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}")
index 1c4faf04441634c76e2c655d96150ddb5ef12c22..b22c7caaaaeebd6e2db2318de4d580f4f11e45f6 100644 (file)
@@ -27,7 +27,7 @@
 SET(INC include src)
 
 IF(UNIX)
-       SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
+       LIST(APPEND INC ${X11_X11_INCLUDE_PATH})
 ENDIF(UNIX)
 
 SET(SRC
@@ -37,4 +37,3 @@ SET(SRC
 ADD_DEFINITIONS(-DGLEW_STATIC)
 
 BLENDERLIB(extern_glew "${SRC}" "${INC}")
-
index 5d73f953e672f1bb7197434ecd44c63867ffac86..6982bd83276f63c3a54200f282c15d287e5cc6b7 100644 (file)
@@ -36,49 +36,43 @@ FILE(GLOB SRC
 )
 
 IF(WITH_FFMPEG)
-       LIST(APPEND INC ffmpeg)
-       LIST(APPEND INC ${FFMPEG_INC})
+       LIST(APPEND INC ffmpeg ${FFMPEG_INC})
        FILE(GLOB FFMPEGSRC ffmpeg/*.cpp)
        ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_SDL)
-       LIST(APPEND INC SDL)
-       LIST(APPEND INC ${SDL_INCLUDE_DIR})
+       LIST(APPEND INC SDL ${SDL_INCLUDE_DIR})
        FILE(GLOB SDLSRC SDL/*.cpp)
        ADD_DEFINITIONS(-DWITH_SDL)
 ENDIF(WITH_SDL)
 
 IF(WITH_OPENAL)
-       LIST(APPEND INC OpenAL)
-       LIST(APPEND INC ${OPENAL_INCLUDE_DIR})
+       LIST(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR})
        FILE(GLOB OPENALSRC OpenAL/*.cpp)
        ADD_DEFINITIONS(-DWITH_OPENAL)
 ENDIF(WITH_OPENAL)
 
 IF(WITH_JACK)
-       LIST(APPEND INC jack)
-       LIST(APPEND INC ${JACK_INC})
+       LIST(APPEND INC jack ${JACK_INC})
        FILE(GLOB JACKSRC jack/*.cpp)
        ADD_DEFINITIONS(-DWITH_JACK)
 ENDIF(WITH_JACK)
 
 IF(WITH_SNDFILE)
-       LIST(APPEND INC sndfile)
-       LIST(APPEND INC ${SNDFILE_INC})
+       LIST(APPEND INC sndfile ${SNDFILE_INC})
        FILE(GLOB SNDFILESRC sndfile/*.cpp)
        ADD_DEFINITIONS(-DWITH_SNDFILE)
 ENDIF(WITH_SNDFILE)
 
 #IF(WITH_FFTW3)
-#      SET(INC ${INC} fftw ${FFTW3_INC})
+#      LIST(APPEND INC fftw ${FFTW3_INC})
 #      FILE(GLOB FFTW3SRC fftw/*.cpp)
 #      ADD_DEFINITIONS(-DWITH_FFTW3)
 #ENDIF(WITH_FFTW3)
 
 IF(WITH_PYTHON)
-       LIST(APPEND INC Python)
-       LIST(APPEND INC ${PYTHON_INC})
+       LIST(APPEND INC Python ${PYTHON_INC})
        FILE(GLOB PYTHONSRC Python/*.cpp)
 ELSE(WITH_PYTHON)
        ADD_DEFINITIONS(-DDISABLE_PYTHON)
index c6ffd4b19139b1bfebd32e6f7d56570a3729e892..ec81ddf8ef21806a5f279b27e8ef01dd07e55580 100644 (file)
@@ -52,13 +52,13 @@ SET(SRC
 
 IF(APPLE)
        IF(WITH_COCOA)
-               SET(SRC ${SRC}
+               LIST(APPEND SRC
                        ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCocoa.mm
                        ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCocoa.mm
                        ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCocoa.mm
                )
        ELSE(WITH_COCOA)
-               SET(SRC ${SRC}
+               LIST(APPEND SRC
                        ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp
                        ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp
                        ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp
@@ -69,18 +69,18 @@ IF(APPLE)
                ADD_DEFINITIONS(-DWITH_QUICKTIME)
        ENDIF(WITH_QUICKTIME)
 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_SystemWin32.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DropTargetWin32.cpp
        )
 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_SystemX11.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp
index f099efd2bb8b20852eb75e7022a6a9c84fd64dea..6c844cbd23209d95491139a7b8d0b86a167bb973 100644 (file)
 #
 # ***** 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)
 
@@ -34,9 +41,8 @@ ENDIF(WITH_OPENMP)
 
 IF(WITH_FFTW3)
        ADD_DEFINITIONS(-DFFTW3=1)
-       SET(INC ${INC} ${FFTW3_INC})
+       LIST(APPEND INC ${FFTW3_INC})
 ENDIF(WITH_FFTW3)
 
-
 BLENDERLIB(bf_intern_smoke "${SRC}" "${INC}")
-#, libtype='blender', priority = 0 )
+
index 0603081b59cb4ac7cd34022e0c39ad5ef59b8aa5..155d14fb5a1a67809293bc2a5a489d539d5409bd 100644 (file)
@@ -87,8 +87,7 @@ IF(WITH_IMAGE_HDR)
 ENDIF(WITH_IMAGE_HDR)
 
 IF(WITH_QUICKTIME)
-       LIST(APPEND INC ../quicktime)
-       LIST(APPEND INC ${QUICKTIME_INC})
+       LIST(APPEND INC ../quicktime ${QUICKTIME_INC})
        ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
@@ -103,8 +102,7 @@ IF(WITH_LCMS)
 ENDIF(WITH_LCMS)
 
 IF(WITH_PYTHON)
-       LIST(APPEND INC ../python)
-       LIST(APPEND INC ${PYTHON_INC})
+       LIST(APPEND INC ../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
        ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
index 998b3c670d0eed71c7dc0dae3c5ba707fac53d90..77615b23d873d7e57b361b7ae83c65d93b63d588 100644 (file)
@@ -34,6 +34,7 @@ SET(INC
        ../gpu
        ../../../intern/ghost
        ../../../intern/guardedalloc
+       ${ZLIB_INC}
        ${FREETYPE_INCLUDE_DIRS}
 )
 
@@ -45,7 +46,7 @@ SET(INC
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 IF(WITH_OPENMP)
index 2699b3b7c3b9cf009ddaabc521ad4b1e6a59447e..42aa5eddc42a0fe402e9737006e10648d5f7418e 100644 (file)
@@ -31,11 +31,11 @@ SET(INC
 )
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 IF(WITH_QUICKTIME)
-       SET(INC ${INC} ${QUICKTIME_INC})
+       LIST(APPEND INC ${QUICKTIME_INC})
        ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
index 9e22bbd7d44f8696b8739a291e252d98a7852af4..b563492134352b41b4111b5c8987c00cce995270 100644 (file)
@@ -33,7 +33,7 @@ SET(INC
 )
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_armature "${SRC}" "${INC}")
index 5f75ceb34efbb69085fdd52669c0c984e1a2f6bf..4145f251a645177f6d1271484d3bf479fd89c01d 100644 (file)
@@ -34,7 +34,7 @@ SET(INC
 )
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_mesh "${SRC}" "${INC}")
index a41b9e89f831bbcbbe54795b342f24e8fd0aa2bf..10fbd62a098c0442771d6856e8574444f0cdabdd 100644 (file)
@@ -41,7 +41,7 @@ IF(NOT WITH_PYTHON)
 ENDIF(NOT WITH_PYTHON)
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_object "${SRC}" "${INC}")
index be826654311b0d7b6afa7a0c91c745902cbd3abf..49f20bb9ed05b3b63dab83ac4d2b5930baec04ae 100644 (file)
@@ -41,7 +41,7 @@ IF(WITH_OPENMP)
 ENDIF(WITH_OPENMP)
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_physics "${SRC}" "${INC}")
index 2ecdc14a4974c414231e27ba27e445f6b22f8ff8..322e69ca84361b3dce9eb0549da7fcd854cd1a07 100644 (file)
@@ -48,7 +48,7 @@ IF(WITH_OPENMP)
 ENDIF(WITH_OPENMP)
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_render "${SRC}" "${INC}")
index 6bbd1112d05c25880451e2ac80fb90c5fccf0430..b6a8e27449bf570da780d5f80849185b2ec9ad17 100644 (file)
@@ -34,7 +34,7 @@ SET(INC
 )
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_screen "${SRC}" "${INC}")
index f0493d8e2d8948726a57d6f714b51dbae8409843..fb8382e10ca530e0173330fb855297e648707909 100644 (file)
@@ -35,7 +35,7 @@ SET(INC
 )
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_sculpt_paint "${SRC}" "${INC}")
index 5cbe9bbe0ba395ab5bf447148912f51140ab8415..207d83b56c662d0298395b39b5d63ef90f228f18 100644 (file)
@@ -61,7 +61,7 @@ IF(WITH_IMAGE_HDR)
 ENDIF(WITH_IMAGE_HDR)
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_space_file "${SRC}" "${INC}")
index f644338d39df5f8a95ca0d8ed89270d175e7ab19..1c0a97767b70bf985742d3bd36a1cce3513ec773 100644 (file)
@@ -47,7 +47,7 @@ IF(WITH_LCMS)
 ENDIF(WITH_LCMS)
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_space_image "${SRC}" "${INC}")
index 0c8f9fc1ee2051a7749862781f1ffed03963ab2d..06dd2257147b3ec3837851a53d9981901d7430ea 100644 (file)
@@ -36,7 +36,7 @@ SET(INC
 )
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 BLENDERLIB(bf_editor_space_node "${SRC}" "${INC}")
index a6945bbe9bbfb4787832cd76113369bb06ef2031..ca9ad001a40115285416e35a5fb3d56d77428513 100644 (file)
@@ -42,7 +42,7 @@ IF(WITH_GAMEENGINE)
 ENDIF(WITH_GAMEENGINE)
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 ADD_DEFINITIONS(-DGLEW_STATIC)
index 49886bdc46f0925d3e77bb2a9ef2c2821081ac70..c0023d49c956448f49ccb8d513ce9724893bbb01 100644 (file)
@@ -41,7 +41,7 @@ SET(INC
 )
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 IF(WITH_IMAGE_OPENEXR)
index 9dbb2fd00aa491d06df30e9609ec71901476edd8..4f9032ffc951d7092e11658d360d08f59acab58a 100644 (file)
@@ -63,7 +63,7 @@ IF(NOT WITH_PYTHON)
 ENDIF(NOT WITH_PYTHON)
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 IF(WITH_GAMEENGINE)
@@ -95,17 +95,17 @@ IF(WITH_IMAGE_HDR)
 ENDIF(WITH_IMAGE_HDR)
 
 IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../../quicktime)
+       LIST(APPEND INC ../../quicktime)
        ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
+       LIST(APPEND INC ${FFMPEG_INC})
        ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_LCMS)
-       SET(INC ${INC} ${LCMS_INCLUDE_DIR})
+       LIST(APPEND INC ${LCMS_INCLUDE_DIR})
        ADD_DEFINITIONS(-DWITH_LCMS)
 ENDIF(WITH_LCMS)
 
index d5e8e37f1fd953ee405bfec78c7aa38058d1b685..8d8423cc19b215f42ee03bd1ab77fc0a7f1913ff 100644 (file)
@@ -40,7 +40,7 @@ SET(INC
 )
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 IF(WITH_PYTHON)
index dcfc8678faa23b4a69399f424995963cd8a38eb9..adb60528f5162926ab4fc0ff956034ca2bc62445 100644 (file)
@@ -46,4 +46,3 @@ IF(WITH_BUILDINFO)
 ENDIF(WITH_BUILDINFO)
 
 BLENDERLIB(bf_python "${SRC}" "${INC}")
-
index 63b6558e9978aea3917ad829cbaeb256561660c3..8d993cbb7d6e3ea9a8b4cc5b77d478a415198083 100644 (file)
@@ -35,7 +35,6 @@ SET(INC
        ../quicktime
        ../makesdna
        ../makesrna
-       ../../../intern/guardedalloc
        ../blenlib
        ../blenkernel
        ../avi
@@ -46,9 +45,10 @@ SET(INC
        ../include
        ../windowmanager
        ../../../intern/audaspace/intern
+       ../../../intern/guardedalloc
+       ${QUICKTIME_INC}
 )
 
-SET(INC ${INC} ${QUICKTIME_INC})
 ADD_DEFINITIONS(-DWITH_QUICKTIME)
 
 BLENDERLIB(bf_quicktime "${SRC}" "${INC}")
index 1b6a29b616aa1a9a1ad31721aaa718ed6dcca0f6..689683049153bb1c12ec6d2e10046f71be0da571 100644 (file)
 FILE(GLOB SRC intern/source/*.c intern/raytrace/*.cpp)
 
 SET(INC 
-       intern/include ../../../intern/guardedalloc ../blenlib ../makesdna
-       extern/include ../blenkernel ../imbuf
-       ../include ../../kernel/gen_messaging ../blenloader
-       ../../../intern/smoke/extern
+       intern/include
+       extern/include
+       ../blenlib
+       ../blenloader
+       ../makesdna
        ../makesrna
+       ../blenkernel
+       ../imbuf
+       ../include
+       ../../kernel/gen_messaging
+       ../../../intern/smoke/extern
+       ../../../intern/guardedalloc
 )
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 IF(WITH_IMAGE_OPENEXR)
@@ -43,14 +50,14 @@ IF(WITH_IMAGE_OPENEXR)
 ENDIF(WITH_IMAGE_OPENEXR)
 
 IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+       LIST(APPEND INC ../quicktime ${QUICKTIME_INC})
        ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(APPLE)
        IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
-               SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpmath=sse")
-               SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpmath=sse")
+               LIST(APPEND CMAKE_C_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(APPLE)
 
index a96cce5fc68915747b4c616f0483ce33e6995a8a..1919bf8e5712371864b85e51f9082e80749b508b 100644 (file)
 
 FILE(GLOB SRC intern/*.c)
 
-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
+SET(INC
+       .
        ../nodes
        ../gpu
        ../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}
 )
 
@@ -52,23 +61,23 @@ IF(WITH_OPENCOLLADA)
 ENDIF(WITH_OPENCOLLADA)
 
 IF(WITH_QUICKTIME)
-       SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
+       LIST(APPEND INC ../quicktime ${QUICKTIME_INC})
        ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
 IF(WITH_FFMPEG)
-       SET(INC ${INC} ${FFMPEG_INC})
+       LIST(APPEND INC ${FFMPEG_INC})
        ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-       SET(INC ${INC} ../python ${PYTHON_INC})
+       LIST(APPEND INC ../python ${PYTHON_INC})
 ELSE(WITH_PYTHON)
        ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
+       LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 IF(WITH_COCOA)
index c4e01ba1a9d9e3892ff0ae69abfc49b64c969647..1e6ae8a8492ada71cd8cdba63a63324c7f4d198c 100644 (file)
@@ -95,12 +95,14 @@ IF(WIN32)
 ENDIF(WIN32)
 
 IF(WITH_BUILDINFO)
-       ADD_DEFINITIONS(-DBUILD_DATE="${BUILD_DATE}")
-       ADD_DEFINITIONS(-DBUILD_TIME="${BUILD_TIME}")
-       ADD_DEFINITIONS(-DBUILD_REV="${BUILD_REV}")
-       ADD_DEFINITIONS(-DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}")
-       ADD_DEFINITIONS(-DBUILD_TYPE="${CMAKE_BUILD_TYPE}")
-       
+       ADD_DEFINITIONS(
+               -DBUILD_DATE="${BUILD_DATE}"
+               -DBUILD_TIME="${BUILD_TIME}"
+               -DBUILD_REV="${BUILD_REV}"
+               -DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}"
+               -DBUILD_TYPE="${CMAKE_BUILD_TYPE}"
+       )
+
        LIST(APPEND EXESRC buildinfo.c)
 ENDIF(WITH_BUILDINFO)
 
index 57d285616472970ab3184f1228ea371135d97282..853cba543a4c18cade34e877e7835882c129b823 100644 (file)
@@ -44,7 +44,7 @@ IF(WITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
+       LIST(APPEND INC ${PYTHON_INC})
 ELSE(WITH_PYTHON)
        ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
index 97c367dd1f15200205fd971f365d6c1c6e3588ae..c5b8128903b63287fdff8ff70024f65a81e1a71c 100644 (file)
@@ -64,7 +64,7 @@ SET(INC
 )
 
 IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
+       LIST(APPEND INC ${PYTHON_INC})
 ELSE(WITH_PYTHON)
        ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
index 85b5daa3b4a9e3412b45800a077667222ce12fe4..126192d21889428c46d0645dd20609beb94b5179 100644 (file)
@@ -37,7 +37,7 @@ SET(INC
 )
 
 IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
+       LIST(APPEND INC ${PYTHON_INC})
 ELSE(WITH_PYTHON)
        ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
index 93183dafeeeab81faafee8f759d491808ffba16c..84d915847e90ff1c15c418194e0ea103704138f9 100644 (file)
@@ -43,7 +43,7 @@ ELSE(WITH_SDL)
 ENDIF(WITH_SDL)
 
 IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
+       LIST(APPEND INC ${PYTHON_INC})
 ELSE(WITH_PYTHON)
        ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
index d8f6e3164ec4931b4cd8d3897445bb0435e76eea..eaead261b2c36c75dee170f9058ffbecbc19fa0a 100644 (file)
@@ -70,7 +70,7 @@ ELSE(WITH_SDL)
 ENDIF(WITH_SDL)
 
 IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
+       LIST(APPEND INC ${PYTHON_INC})
 ELSE(WITH_PYTHON)
        ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
index ce3d8fa22fcec2e6c350b87191b39785eedcac6a..106d1a84a9204585c99a4cc647411f23f0118d5c 100644 (file)
@@ -39,7 +39,7 @@ SET(INC
 )
 
 IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
+       LIST(APPEND INC ${PYTHON_INC})
 ELSE(WITH_PYTHON)
        ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)
index 3af514ca0de45a3232cabc2b9aa49c3e2080415c..34a32328e29143f47a6949520529bbc2ade9075b 100644 (file)
@@ -58,7 +58,7 @@ IF(WITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
-       SET(INC ${INC} ${PYTHON_INC})
+       LIST(APPEND INC ${PYTHON_INC})
 ELSE(WITH_PYTHON)
        ADD_DEFINITIONS(-DDISABLE_PYTHON)
 ENDIF(WITH_PYTHON)