[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29224] trunk/blender/source/blender/ editors: remove cruft from cmake files, more to go
Campbell Barton
ideasman42 at gmail.com
Fri Jun 4 22:57:02 CEST 2010
Revision: 29224
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29224
Author: campbellbarton
Date: 2010-06-04 22:56:56 +0200 (Fri, 04 Jun 2010)
Log Message:
-----------
remove cruft from cmake files, more to go
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_file/CMakeLists.txt
trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
trunk/blender/source/blender/editors/space_image/CMakeLists.txt
trunk/blender/source/blender/editors/space_info/CMakeLists.txt
trunk/blender/source/blender/editors/space_info/SConscript
trunk/blender/source/blender/editors/space_logic/CMakeLists.txt
trunk/blender/source/blender/editors/space_nla/CMakeLists.txt
trunk/blender/source/blender/editors/space_node/CMakeLists.txt
trunk/blender/source/blender/editors/space_outliner/CMakeLists.txt
trunk/blender/source/blender/editors/space_script/CMakeLists.txt
trunk/blender/source/blender/editors/space_sequencer/CMakeLists.txt
trunk/blender/source/blender/editors/space_sound/CMakeLists.txt
trunk/blender/source/blender/editors/space_text/CMakeLists.txt
trunk/blender/source/blender/editors/space_time/CMakeLists.txt
trunk/blender/source/blender/editors/space_userpref/CMakeLists.txt
trunk/blender/source/blender/editors/space_userpref/SConscript
trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
trunk/blender/source/blender/editors/transform/CMakeLists.txt
trunk/blender/source/blender/editors/util/CMakeLists.txt
trunk/blender/source/blender/editors/uvedit/CMakeLists.txt
Modified: trunk/blender/source/blender/editors/space_file/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_file/CMakeLists.txt 2010-06-04 19:52:57 UTC (rev 29223)
+++ trunk/blender/source/blender/editors/space_file/CMakeLists.txt 2010-06-04 20:56:56 UTC (rev 29224)
@@ -27,43 +27,20 @@
FILE(GLOB SRC *.c)
SET(INC
- ../../windowmanager
- ../../editors/include
- ../../editors/interface
- ../../../../intern/guardedalloc
- ../../../../intern/memutil
- ../../blenlib ../../makesdna
- ../../makesrna ../../blenkernel
- ../../include ../../imbuf
- ../../render/extern/include
- ../../../../intern/bsp/extern
- ../../../../intern/decimation/extern
+ ../../blenfont
+ ../../blenkernel
+ ../../blenlib
../../blenloader
- ../../python
- ../../../kernel/gen_system
- ../../readstreamglue
- ../../../../intern/elbeem/extern
- ../../../../intern/ghost
- ../../../../intern/opennl/extern
- ../../../../extern/glew/include
- ../../../../intern/smoke/extern
+ ../../imbuf
+ ../include
../../../../intern/audaspace/intern
- ../../nodes
- ../../gpu
- ../../blenfont
- ../../ikplugin
+ ../../../../intern/guardedalloc
+ ../../makesdna
+ ../../makesrna
+ ../../render/extern/include
+ ../../windowmanager
)
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
- ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
- ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
IF(WITH_OPENEXR)
ADD_DEFINITIONS(-DWITH_OPENEXR)
ENDIF(WITH_OPENEXR)
@@ -76,36 +53,8 @@
ADD_DEFINITIONS(-DWITH_OPENJPEG)
ENDIF(WITH_OPENJPEG)
-IF(WITH_QUICKTIME)
- SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
- ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
+IF(WITH_DDS)
+ ADD_DEFINITIONS(-DWITH_DDS)
+ENDIF(WITH_DDS)
-IF(WITH_FFMPEG)
- SET(INC ${INC} ${FFMPEG_INC})
- ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
- ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
- ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
- SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
- ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-IF(WIN32)
- SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
- ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
BLENDERLIB(bf_editor_space_file "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/space_graph/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_graph/CMakeLists.txt 2010-06-04 19:52:57 UTC (rev 29223)
+++ trunk/blender/source/blender/editors/space_graph/CMakeLists.txt 2010-06-04 20:56:56 UTC (rev 29224)
@@ -27,85 +27,14 @@
FILE(GLOB SRC *.c)
SET(INC
- ../../windowmanager
- ../../editors/include
- ../../editors/interface
+ ../../blenkernel
+ ../../blenlib
+ ../include
../../../../intern/guardedalloc
- ../../../../intern/memutil
- ../../blenlib ../../makesdna
- ../../makesrna ../../blenkernel
- ../../include ../../imbuf
- ../../render/extern/include
- ../../../../intern/bsp/extern
- ../../../../intern/decimation/extern
- ../../blenloader
- ../../python
- ../../../kernel/gen_system
- ../../readstreamglue
- ../../../../intern/elbeem/extern
- ../../../../intern/ghost
- ../../../../intern/opennl/extern
- ../../../../extern/glew/include
- ../../../../intern/smoke/extern
+ ../../makesdna
+ ../../makesrna
+ ../../windowmanager
../../../../intern/audaspace/intern
- ../../nodes
- ../../gpu
- ../../blenfont
- ../../ikplugin
)
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
- ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
- ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
- ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
- ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
- ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
- SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
- ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
- SET(INC ${INC} ${FFMPEG_INC})
- ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
- ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
- ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
- SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
- ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-IF(WIN32)
- SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
- ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
BLENDERLIB(bf_editor_space_graph "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/space_image/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_image/CMakeLists.txt 2010-06-04 19:52:57 UTC (rev 29223)
+++ trunk/blender/source/blender/editors/space_image/CMakeLists.txt 2010-06-04 20:56:56 UTC (rev 29224)
@@ -27,43 +27,17 @@
FILE(GLOB SRC *.c)
SET(INC
- ../../windowmanager
- ../../editors/include
- ../../editors/interface
+ ../../blenkernel
+ ../../blenlib
+ ../../imbuf
+ ../include
../../../../intern/guardedalloc
- ../../../../intern/memutil
- ../../blenlib ../../makesdna
- ../../makesrna ../../blenkernel
- ../../include ../../imbuf
+ ../../makesdna
+ ../../makesrna
../../render/extern/include
- ../../../../intern/bsp/extern
- ../../../../intern/decimation/extern
- ../../blenloader
- ../../python
- ../../../kernel/gen_system
- ../../readstreamglue
- ../../../../intern/elbeem/extern
- ../../../../intern/ghost
- ../../../../intern/opennl/extern
- ../../../../extern/glew/include
- ../../../../intern/smoke/extern
- ../../../../intern/audaspace/intern
- ../../nodes
- ../../gpu
- ../../blenfont
- ../../ikplugin
+ ../../windowmanager
)
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
- ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
- ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
IF(WITH_OPENEXR)
ADD_DEFINITIONS(-DWITH_OPENEXR)
ENDIF(WITH_OPENEXR)
@@ -72,40 +46,8 @@
ADD_DEFINITIONS(-DWITH_TIFF)
ENDIF(WITH_TIFF)
-IF(WITH_OPENJPEG)
- ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
- SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
- ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
- SET(INC ${INC} ${FFMPEG_INC})
- ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
- ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
- ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
- SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
- ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
IF(WIN32)
SET(INC ${INC} ${PTHREADS_INC})
ENDIF(WIN32)
-IF(WITH_BUILDINFO)
- ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
BLENDERLIB(bf_editor_space_image "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/space_info/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_info/CMakeLists.txt 2010-06-04 19:52:57 UTC (rev 29223)
+++ trunk/blender/source/blender/editors/space_info/CMakeLists.txt 2010-06-04 20:56:56 UTC (rev 29224)
@@ -15,11 +15,6 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
# Contributor(s): Jacques Beaurain.
#
# ***** END GPL LICENSE BLOCK *****
@@ -27,85 +22,14 @@
FILE(GLOB SRC *.c)
SET(INC
- ../../windowmanager
- ../../editors/include
- ../../editors/interface
+ ../../blenkernel
+ ../../blenlib
+ ../../imbuf
+ ../include
../../../../intern/guardedalloc
- ../../../../intern/memutil
- ../../blenlib ../../makesdna
- ../../makesrna ../../blenkernel
- ../../include ../../imbuf
- ../../render/extern/include
- ../../../../intern/bsp/extern
- ../../../../intern/decimation/extern
- ../../blenloader
- ../../python
- ../../../kernel/gen_system
- ../../readstreamglue
- ../../../../intern/elbeem/extern
- ../../../../intern/ghost
- ../../../../intern/opennl/extern
- ../../../../extern/glew/include
- ../../../../intern/smoke/extern
- ../../../../intern/audaspace/intern
- ../../nodes
- ../../gpu
- ../../blenfont
- ../../ikplugin
+ ../../makesdna
+ ../../makesrna
+ ../../windowmanager
)
-ADD_DEFINITIONS(-DGLEW_STATIC)
-
-IF(WITH_GAMEENGINE)
- ADD_DEFINITIONS(-DGAMEBLENDER)
-ENDIF(WITH_GAMEENGINE)
-
-IF(WITH_INTERNATIONAL)
- ADD_DEFINITIONS(-DINTERNATIONAL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_OPENEXR)
- ADD_DEFINITIONS(-DWITH_OPENEXR)
-ENDIF(WITH_OPENEXR)
-
-IF(WITH_TIFF)
- ADD_DEFINITIONS(-DWITH_TIFF)
-ENDIF(WITH_TIFF)
-
-IF(WITH_OPENJPEG)
- ADD_DEFINITIONS(-DWITH_OPENJPEG)
-ENDIF(WITH_OPENJPEG)
-
-IF(WITH_QUICKTIME)
- SET(INC ${INC} ../quicktime ${QUICKTIME_INC})
- ADD_DEFINITIONS(-DWITH_QUICKTIME)
-ENDIF(WITH_QUICKTIME)
-
-IF(WITH_FFMPEG)
- SET(INC ${INC} ${FFMPEG_INC})
- ADD_DEFINITIONS(-DWITH_FFMPEG)
-ENDIF(WITH_FFMPEG)
-
-IF(WITH_OPENMP)
- ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-IF(NOT WITH_ELBEEM)
- ADD_DEFINITIONS(-DDISABLE_ELBEEM)
-ENDIF(NOT WITH_ELBEEM)
-
-IF(WITH_PYTHON)
- SET(INC ${INC} ${PYTHON_INC})
-ELSE(WITH_PYTHON)
- ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
-
-IF(WIN32)
- SET(INC ${INC} ${PTHREADS_INC})
-ENDIF(WIN32)
-
-IF(WITH_BUILDINFO)
- ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(WITH_BUILDINFO)
-
BLENDERLIB(bf_editor_space_info "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/space_info/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_info/SConscript 2010-06-04 19:52:57 UTC (rev 29223)
+++ trunk/blender/source/blender/editors/space_info/SConscript 2010-06-04 20:56:56 UTC (rev 29224)
@@ -8,7 +8,4 @@
defs = []
-if env['WITH_BF_GAMEENGINE']:
- defs.append('GAMEBLENDER=1')
-
env.BlenderLib ( 'bf_editors_space_info', sources, Split(incs), defs, libtype=['core'], priority=[70] )
Modified: trunk/blender/source/blender/editors/space_logic/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_logic/CMakeLists.txt 2010-06-04 19:52:57 UTC (rev 29223)
+++ trunk/blender/source/blender/editors/space_logic/CMakeLists.txt 2010-06-04 20:56:56 UTC (rev 29224)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list