[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13120] branches/blender2.5/blender/source : Support for CMake
Chris Want
cwant at ualberta.ca
Thu Jan 3 23:20:45 CET 2008
Revision: 13120
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13120
Author: hos
Date: 2008-01-03 23:20:45 +0100 (Thu, 03 Jan 2008)
Log Message:
-----------
Support for CMake
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/CMakeLists.txt
branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt
branches/blender2.5/blender/source/blender/radiosity/CMakeLists.txt
branches/blender2.5/blender/source/creator/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Converter/CMakeLists.txt
Added Paths:
-----------
branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
Modified: branches/blender2.5/blender/source/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/CMakeLists.txt 2008-01-03 21:29:12 UTC (rev 13119)
+++ branches/blender2.5/blender/source/blender/CMakeLists.txt 2008-01-03 22:20:45 UTC (rev 13120)
@@ -27,7 +27,7 @@
#
# ***** END GPL/BL DUAL LICENSE BLOCK *****
-SUBDIRS(avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon makesdna python radiosity readblenfile render src yafray)
+SUBDIRS(windowmanager editors avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon makesdna python radiosity readblenfile render yafray)
IF(WITH_INTERNATIONAL)
SUBDIRS(ftfont)
Modified: branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt 2008-01-03 21:29:12 UTC (rev 13119)
+++ branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt 2008-01-03 22:20:45 UTC (rev 13120)
@@ -35,7 +35,7 @@
../imbuf ../avi ../../../intern/elbeem/extern
../../../intern/iksolver/extern ../blenloader ../quicktime
../../../intern/bmfont
- ../nodes
+ ../nodes ../editors/include
${SDL_INC}
${ZLIB_INC}
)
Added: branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/editors/CMakeLists.txt (rev 0)
+++ branches/blender2.5/blender/source/blender/editors/CMakeLists.txt 2008-01-03 22:20:45 UTC (rev 13120)
@@ -0,0 +1,86 @@
+# $Id: CMakeLists.txt 12931 2007-12-17 18:20:48Z theeth $
+# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version. The Blender
+# Foundation also sells licenses for use in proprietary software under
+# the Blender License. See http://www.blender.org/BL/ for information
+# about this.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/BL DUAL LICENSE BLOCK *****
+
+FILE(GLOB SRC */*.c)
+
+SET(INC ../windowmanager
+ ../editors/include
+ ../../../intern/guardedalloc ../../../intern/memutil
+ ../blenlib ../makesdna ../blenkernel
+ ../include ../../../intern/bmfont ../imbuf ../render/extern/include
+ ../../../intern/bsp/extern ../radiosity/extern/include
+ ../../../intern/decimation/extern ../blenloader ../python
+ ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
+ ../quicktime ../../../intern/elbeem/extern
+ ../../../intern/ghost ../../../intern/opennl/extern
+ ../nodes
+ ${PYTHON_INC}
+ ${SDL_INC}
+)
+
+IF(WITH_INTERNATIONAL)
+ SET(INC ${INC} ../ftfont)
+ ADD_DEFINITIONS(-DINTERNATIONAL)
+ ADD_DEFINITIONS(-DFTGL_STATIC_LIBRARY)
+ENDIF(WITH_INTERNATIONAL)
+
+IF(WITH_OPENEXR)
+ ADD_DEFINITIONS(-DWITH_OPENEXR)
+ENDIF(WITH_OPENEXR)
+
+IF(WITH_QUICKTIME)
+ SET(INC ${INC} ${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(WIN32)
+ SET(INC ${INC} ${PTHREADS_INC})
+ENDIF(WIN32)
+
+IF(WITH_VERSE)
+ SET(INC ${INC} ${VERSE_INC})
+ ADD_DEFINITIONS(-DWITH_VERSE)
+ENDIF(WITH_VERSE)
+
+# TODO buildinfo
+IF(BF_BUILDINFO)
+ ADD_DEFINITIONS(-DNAN_BUILDINFO)
+ENDIF(BF_BUILDINFO)
+
+BLENDERLIB_NOLIST(bf_editors "${SRC}" "${INC}")
+
+IF(WITH_VERSE)
+ ADD_DEPENDENCIES(bf_editors mkprot verse)
+ENDIF(WITH_VERSE)
+
Modified: branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt 2008-01-03 21:29:12 UTC (rev 13119)
+++ branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt 2008-01-03 22:20:45 UTC (rev 13120)
@@ -33,7 +33,7 @@
../python ../render/extern/include ../../../intern/decimation/extern
../imbuf ../avi ../../../intern/elbeem/extern
../../../intern/iksolver/extern ../blenloader ../quicktime
- ../blenkernel
+ ../blenkernel ../editors/include
${SDL_INC}
${ZLIB_INC}
)
Modified: branches/blender2.5/blender/source/blender/radiosity/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/radiosity/CMakeLists.txt 2008-01-03 21:29:12 UTC (rev 13119)
+++ branches/blender2.5/blender/source/blender/radiosity/CMakeLists.txt 2008-01-03 22:20:45 UTC (rev 13120)
@@ -32,7 +32,7 @@
SET(INC
extern/include ../blenlib ../blenkernel ../makesdna ../include
../../../intern/guardedalloc ../render/extern/include
- ../render/intern/include
+ ../render/intern/include ../editors/include
)
BLENDERLIB_NOLIST(blender_radiosity "${SRC}" "${INC}")
Added: branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt (rev 0)
+++ branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt 2008-01-03 22:20:45 UTC (rev 13120)
@@ -0,0 +1,86 @@
+# $Id: CMakeLists.txt 12931 2007-12-17 18:20:48Z theeth $
+# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version. The Blender
+# Foundation also sells licenses for use in proprietary software under
+# the Blender License. See http://www.blender.org/BL/ for information
+# about this.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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/BL DUAL LICENSE BLOCK *****
+
+FILE(GLOB SRC intern/*.c)
+
+SET(INC .
+ ../editors/include
+ ../../../intern/guardedalloc ../../../intern/memutil
+ ../blenlib ../makesdna ../blenkernel
+ ../include ../../../intern/bmfont ../imbuf ../render/extern/include
+ ../../../intern/bsp/extern ../radiosity/extern/include
+ ../../../intern/decimation/extern ../blenloader ../python
+ ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
+ ../quicktime ../../../intern/elbeem/extern
+ ../../../intern/ghost ../../../intern/opennl/extern
+ ../nodes
+ ${PYTHON_INC}
+ ${SDL_INC}
+)
+
+IF(WITH_INTERNATIONAL)
+ SET(INC ${INC} ../ftfont)
+ ADD_DEFINITIONS(-DINTERNATIONAL)
+ ADD_DEFINITIONS(-DFTGL_STATIC_LIBRARY)
+ENDIF(WITH_INTERNATIONAL)
+
+IF(WITH_OPENEXR)
+ ADD_DEFINITIONS(-DWITH_OPENEXR)
+ENDIF(WITH_OPENEXR)
+
+IF(WITH_QUICKTIME)
+ SET(INC ${INC} ${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(WIN32)
+ SET(INC ${INC} ${PTHREADS_INC})
+ENDIF(WIN32)
+
+IF(WITH_VERSE)
+ SET(INC ${INC} ${VERSE_INC})
+ ADD_DEFINITIONS(-DWITH_VERSE)
+ENDIF(WITH_VERSE)
+
+# TODO buildinfo
+IF(BF_BUILDINFO)
+ ADD_DEFINITIONS(-DNAN_BUILDINFO)
+ENDIF(BF_BUILDINFO)
+
+BLENDERLIB_NOLIST(bf_windowmanager "${SRC}" "${INC}")
+
+IF(WITH_VERSE)
+ ADD_DEPENDENCIES(bf_windowmanager mkprot verse)
+ENDIF(WITH_VERSE)
+
Modified: branches/blender2.5/blender/source/creator/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/creator/CMakeLists.txt 2008-01-03 21:29:12 UTC (rev 13119)
+++ branches/blender2.5/blender/source/creator/CMakeLists.txt 2008-01-03 22:20:45 UTC (rev 13120)
@@ -40,6 +40,7 @@
../blender/render/extern/include
../blender/python
../blender/makesdna
+ ../blender/windowmanager
../kernel/gen_messaging
../kernel/gen_system
)
@@ -189,12 +190,13 @@
FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
-SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} src blender_python blender_render blender_radiosity blender_IK bf_elbeem)
+SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_editors blender_render blender_radiosity blender_IK bf_elbeem)
IF(UNIX)
# Sort libraries
SET(BLENDER_SORTED_LIBS
- src
+ bf_windowmanager
+ bf_editors
bf_decimation
blender_BSP
bf_soundsystem
@@ -226,7 +228,8 @@
bf_moto
bf_bmfont
verse
- src
+ bf_windowmanager
+ bf_editors
bf_ftfont
extern_ftgl
bf_blroutines
Modified: branches/blender2.5/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/gameengine/BlenderRoutines/CMakeLists.txt 2008-01-03 21:29:12 UTC (rev 13119)
+++ branches/blender2.5/blender/source/gameengine/BlenderRoutines/CMakeLists.txt 2008-01-03 22:20:45 UTC (rev 13120)
@@ -15,6 +15,8 @@
../../../source/gameengine/Ketsji
../../../source/blender/blenlib
../../../source/blender/blenkernel
+ ../../../source/blender/editors/include
+ ../../../source/blender/windowmanager
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list