[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11210] branches/soc-2007-maike: CMake support for this project (again, gameengine must
Chris Want
cwant at ualberta.ca
Tue Jul 10 18:52:59 CEST 2007
Revision: 11210
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11210
Author: hos
Date: 2007-07-10 18:52:59 +0200 (Tue, 10 Jul 2007)
Log Message:
-----------
CMake support for this project (again, gameengine must
be disabled).
Modified Paths:
--------------
branches/soc-2007-maike/CMakeLists.txt
branches/soc-2007-maike/extern/CMakeLists.txt
branches/soc-2007-maike/extern/bFTGL/CMakeLists.txt
branches/soc-2007-maike/intern/bmfont/CMakeLists.txt
branches/soc-2007-maike/intern/ghost/CMakeLists.txt
branches/soc-2007-maike/source/blender/blenkernel/CMakeLists.txt
branches/soc-2007-maike/source/blender/ftfont/CMakeLists.txt
branches/soc-2007-maike/source/blender/nodes/CMakeLists.txt
branches/soc-2007-maike/source/blender/python/CMakeLists.txt
branches/soc-2007-maike/source/blender/radiosity/CMakeLists.txt
branches/soc-2007-maike/source/blender/src/CMakeLists.txt
branches/soc-2007-maike/source/creator/CMakeLists.txt
Added Paths:
-----------
branches/soc-2007-maike/extern/glew/CMakeLists.txt
Modified: branches/soc-2007-maike/CMakeLists.txt
===================================================================
--- branches/soc-2007-maike/CMakeLists.txt 2007-07-10 15:34:43 UTC (rev 11209)
+++ branches/soc-2007-maike/CMakeLists.txt 2007-07-10 16:52:59 UTC (rev 11210)
@@ -369,6 +369,9 @@
SET(FTGL_INC ${FTGL}/include)
SET(FTGL_LIB extern_ftgl)
+SET(GLEW ${CMAKE_SOURCE_DIR}/extern/glew)
+SET(GLEW_INC ${GLEW}/include)
+SET(GLEW_LIB extern_glew)
#-----------------------------------------------------------------------------
# Configure OpenGL.
Modified: branches/soc-2007-maike/extern/CMakeLists.txt
===================================================================
--- branches/soc-2007-maike/extern/CMakeLists.txt 2007-07-10 15:34:43 UTC (rev 11209)
+++ branches/soc-2007-maike/extern/CMakeLists.txt 2007-07-10 16:52:59 UTC (rev 11210)
@@ -35,6 +35,8 @@
ENDIF(WITH_BULLET)
ENDIF(WITH_GAMEENGINE)
+SUBDIRS(glew)
+
IF(WITH_INTERNATIONAL)
SUBDIRS(bFTGL)
ENDIF(WITH_INTERNATIONAL)
Modified: branches/soc-2007-maike/extern/bFTGL/CMakeLists.txt
===================================================================
--- branches/soc-2007-maike/extern/bFTGL/CMakeLists.txt 2007-07-10 15:34:43 UTC (rev 11209)
+++ branches/soc-2007-maike/extern/bFTGL/CMakeLists.txt 2007-07-10 16:52:59 UTC (rev 11210)
@@ -28,6 +28,7 @@
# ***** END GPL/BL DUAL LICENSE BLOCK *****
SET(INC include src ${FREETYPE_INC})
+SET(INC ${INC} ${GLEW_INC})
FILE(GLOB SRC src/*.cpp)
ADD_DEFINITIONS(-DFTGL_LIBRARY_STATIC)
Added: branches/soc-2007-maike/extern/glew/CMakeLists.txt
===================================================================
--- branches/soc-2007-maike/extern/glew/CMakeLists.txt (rev 0)
+++ branches/soc-2007-maike/extern/glew/CMakeLists.txt 2007-07-10 16:52:59 UTC (rev 11210)
@@ -0,0 +1,33 @@
+# $Id: CMakeLists.txt 8915 2006-11-17 02:27:12Z jbinto $
+# ***** 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 *****
+
+SET(INC ${INC} ${GLEW_INC})
+
+FILE(GLOB SRC src/*.c)
+BLENDERLIB(extern_glew "${SRC}" "${INC}")
Modified: branches/soc-2007-maike/intern/bmfont/CMakeLists.txt
===================================================================
--- branches/soc-2007-maike/intern/bmfont/CMakeLists.txt 2007-07-10 15:34:43 UTC (rev 11209)
+++ branches/soc-2007-maike/intern/bmfont/CMakeLists.txt 2007-07-10 16:52:59 UTC (rev 11210)
@@ -28,6 +28,7 @@
# ***** END GPL/BL DUAL LICENSE BLOCK *****
SET(INC . intern)
+SET(INC ${INC} ${GLEW_INC})
FILE(GLOB SRC intern/*.cpp)
Modified: branches/soc-2007-maike/intern/ghost/CMakeLists.txt
===================================================================
--- branches/soc-2007-maike/intern/ghost/CMakeLists.txt 2007-07-10 15:34:43 UTC (rev 11209)
+++ branches/soc-2007-maike/intern/ghost/CMakeLists.txt 2007-07-10 16:52:59 UTC (rev 11210)
@@ -28,6 +28,7 @@
# ***** END GPL/BL DUAL LICENSE BLOCK *****
SET(INC . ../string ${WINTAB_INC})
+SET(INC ${INC} ${GLEW_INC})
FILE(GLOB SRC intern/*.cpp)
Modified: branches/soc-2007-maike/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/soc-2007-maike/source/blender/blenkernel/CMakeLists.txt 2007-07-10 15:34:43 UTC (rev 11209)
+++ branches/soc-2007-maike/source/blender/blenkernel/CMakeLists.txt 2007-07-10 16:52:59 UTC (rev 11210)
@@ -39,6 +39,8 @@
${ZLIB_INC}
)
+SET(INC ${INC} ${GLEW_INC})
+
IF(WITH_VERSE)
ADD_DEFINITIONS(-DWITH_VERSE)
SET(INC ${INC} ${VERSE_INC})
Modified: branches/soc-2007-maike/source/blender/ftfont/CMakeLists.txt
===================================================================
--- branches/soc-2007-maike/source/blender/ftfont/CMakeLists.txt 2007-07-10 15:34:43 UTC (rev 11209)
+++ branches/soc-2007-maike/source/blender/ftfont/CMakeLists.txt 2007-07-10 16:52:59 UTC (rev 11210)
@@ -36,6 +36,8 @@
${GETTEXT_INC}
)
+SET(INC ${INC} ${GLEW_INC})
+
ADD_DEFINITIONS(-DFTGL_LIBRARY_STATIC)
IF(WIN32)
Modified: branches/soc-2007-maike/source/blender/nodes/CMakeLists.txt
===================================================================
--- branches/soc-2007-maike/source/blender/nodes/CMakeLists.txt 2007-07-10 15:34:43 UTC (rev 11209)
+++ branches/soc-2007-maike/source/blender/nodes/CMakeLists.txt 2007-07-10 16:52:59 UTC (rev 11210)
@@ -38,6 +38,8 @@
${ZLIB_INC}
)
+SET(INC ${INC} ${GLEW_INC})
+
IF(WITH_VERSE)
ADD_DEFINITIONS(-DWITH_VERSE)
SET(INC ${INC} ${VERSE_INC})
Modified: branches/soc-2007-maike/source/blender/python/CMakeLists.txt
===================================================================
--- branches/soc-2007-maike/source/blender/python/CMakeLists.txt 2007-07-10 15:34:43 UTC (rev 11209)
+++ branches/soc-2007-maike/source/blender/python/CMakeLists.txt 2007-07-10 16:52:59 UTC (rev 11210)
@@ -40,6 +40,8 @@
${PYTHON_INC}
)
+SET(INC ${INC} ${GLEW_INC})
+
IF(WITH_QUICKTIME)
SET(INC ${INC} ${QUICKTIME_INC})
ADD_DEFINITIONS(-DWITH_QUICKTIME)
Modified: branches/soc-2007-maike/source/blender/radiosity/CMakeLists.txt
===================================================================
--- branches/soc-2007-maike/source/blender/radiosity/CMakeLists.txt 2007-07-10 15:34:43 UTC (rev 11209)
+++ branches/soc-2007-maike/source/blender/radiosity/CMakeLists.txt 2007-07-10 16:52:59 UTC (rev 11210)
@@ -35,5 +35,7 @@
../render/intern/include
)
+SET(INC ${INC} ${GLEW_INC})
+
BLENDERLIB_NOLIST(blender_radiosity "${SRC}" "${INC}")
#env.BlenderLib ( 'blender_radiosity', sources, Split(incs), [], libtype='core', priority=50 )
Modified: branches/soc-2007-maike/source/blender/src/CMakeLists.txt
===================================================================
--- branches/soc-2007-maike/source/blender/src/CMakeLists.txt 2007-07-10 15:34:43 UTC (rev 11209)
+++ branches/soc-2007-maike/source/blender/src/CMakeLists.txt 2007-07-10 16:52:59 UTC (rev 11210)
@@ -43,6 +43,8 @@
${SDL_INC}
)
+SET(INC ${INC} ${GLEW_INC})
+
IF(WITH_INTERNATIONAL)
SET(INC ${INC} ../ftfont)
ADD_DEFINITIONS(-DINTERNATIONAL)
Modified: branches/soc-2007-maike/source/creator/CMakeLists.txt
===================================================================
--- branches/soc-2007-maike/source/creator/CMakeLists.txt 2007-07-10 15:34:43 UTC (rev 11209)
+++ branches/soc-2007-maike/source/creator/CMakeLists.txt 2007-07-10 16:52:59 UTC (rev 11210)
@@ -42,6 +42,7 @@
../blender/makesdna
../kernel/gen_messaging
../kernel/gen_system
+ ${GLEW_INC}
)
IF(WITH_QUICKTIME)
@@ -228,7 +229,8 @@
verse
src
bf_ftfont
- extern_ftgl
+ extern_ftgl
+ extern_glew
bf_blroutines
bf_converter
bf_dummy
More information about the Bf-blender-cvs
mailing list