patch to get cmake working with nodes now. Provided by Genscher.

I still have linking issues with it but it is better as is so I'm
commiting it.  Hopefully will have it fixed fully shortly.

Kent

diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 24f81cfa9075adf564874f2ed16370941b96b4a0..fa9199006a88ab7c6f36b5544bf5e337a05bf2af 100644 (file)
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -27,7 +27,7 @@
 #
 # ***** END GPL/BL DUAL LICENSE BLOCK *****
 
-SUBDIRS(avi blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon makesdna python radiosity readblenfile render src yafray)
+SUBDIRS(avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon makesdna python radiosity readblenfile render src yafray)
 
 IF(WITH_INTERNATIONAL)
   SUBDIRS(ftfont)

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index ac188003a4b34750d3c9853560eaaeebe915b1f8..b8c23a6517d4501b5df515d4575fa2cd4698327d 100644 (file)
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -34,6 +34,7 @@ SET(INC
   ../python ../render/extern/include ../../../intern/decimation/extern
   ../imbuf ../avi ../../../intern/elbeem/extern
   ../../../intern/iksolver/extern ../blenloader ../quicktime
+  ../nodes
   ${SDL_INC}
   ${ZLIB_INC}
 )

diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
new file mode 100644 (file)
index 0000000..d3e1447
--- /dev/null
+++ b/source/blender/nodes/CMakeLists.txt
@@ -0,0 +1,75 @@
+# ***** 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 intern/CMP_nodes/*.c intern/SHD_nodes/*.c)
+
+SET(INC 
+  . ../../../intern/guardedalloc ../include ../blenlib ../makesdna
+  ../python ../render/extern/include ../../../intern/decimation/extern
+  ../imbuf ../avi ../../../intern/elbeem/extern
+  ../../../intern/iksolver/extern ../blenloader ../quicktime
+  ../blenkernel
+  ${SDL_INC}
+  ${ZLIB_INC}
+)
+
+IF(WITH_VERSE)
+  ADD_DEFINITIONS(-DWITH_VERSE)
+  SET(INC ${INC} ${VERSE_INC})
+ENDIF(WITH_VERSE)
+
+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(WITH_PLAYER)
+  SUBDIRS(bad_level_call_stubs)
+ENDIF(WITH_PLAYER)
+
+ADD_DEFINITIONS(-DWITH_CCGSUBSURF)
+
+BLENDERLIB(bf_nodes "${SRC}" "${INC}")
+
+IF(WITH_VERSE)
+  ADD_DEPENDENCIES(bf_nodes mkprot verse)
+ENDIF(WITH_VERSE)
+
+IF(WITH_INTERNATIONAL)
+   ADD_DEFINITIONS(-DWITH_FREETYPE2)
+ENDIF(WITH_INTERNATIONAL)
+

diff --git a/source/blender/src/CMakeLists.txt b/source/blender/src/CMakeLists.txt
index 7624531daaca2a385dff857e7363dda13d178d56..d4a0cbf7c3d8506755a30a9f1ea2543e4cb9073e 100644 (file)
--- a/source/blender/src/CMakeLists.txt
+++ b/source/blender/src/CMakeLists.txt
@@ -38,6 +38,7 @@ SET(INC
   ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
   ../quicktime ../../../intern/elbeem/extern
   ../../../intern/ghost ../../../intern/opennl/extern
+  ../nodes
   ${PYTHON_INC}
   ${SDL_INC}
 )

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 70c54d70edfbbe26f22f34061e6de20725c013ad..2c23148853e9e03a8813bf60a70693e7f6d3f487 100644 (file)
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -31,6 +31,7 @@ SETUP_LIBDIRS()
 
 INCLUDE_DIRECTORIES(../../intern/guardedalloc
   ../blender/blenlib
+  ../blender/nodes
   ../blender/blenkernel
   ../blender/include
   ../blender/blenloader
@@ -188,7 +189,7 @@ ADD_DEPENDENCIES(blender makesdna)
 
 FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
 
-SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} src blender_python blender_render blender_radiosity blender_IK bf_elbeem)
+SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} src blender_python blender_render blender_radiosity blender_IK bf_elbeem)
 
 IF(UNIX)
   # Sort libraries
@@ -203,6 +204,7 @@ IF(UNIX)
     blender_radiosity 
     blender_ONL 
     blender_python 
+    bf_nodes
     bf_blenkernel 
     bf_blenloader 
     bf_blenpluginapi