[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23319] branches/soc-2009-chingachgook: Support for building opencollada branch using CMake.

[Chris Want]

Revision: 23319
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23319
Author:   hos
Date:     2009-09-18 01:17:31 +0200 (Fri, 18 Sep 2009)

Log Message:
-----------
Support for building opencollada branch using CMake. Not sure how
to tell the system to make the location of libpcre and libexpat
a settable option though -- maybe somebody who is more of an
expert can look at this.

Modified Paths:
--------------
    branches/soc-2009-chingachgook/CMake/macros.cmake
    branches/soc-2009-chingachgook/CMakeLists.txt
    branches/soc-2009-chingachgook/source/blender/CMakeLists.txt
    branches/soc-2009-chingachgook/source/creator/CMakeLists.txt

Modified: branches/soc-2009-chingachgook/CMake/macros.cmake
===================================================================
--- branches/soc-2009-chingachgook/CMake/macros.cmake	2009-09-17 23:05:33 UTC (rev 23318)
+++ branches/soc-2009-chingachgook/CMake/macros.cmake	2009-09-17 23:17:31 UTC (rev 23319)
@@ -50,6 +50,11 @@
   IF(WITH_OPENAL)
     LINK_DIRECTORIES(${OPENAL_LIBPATH})
   ENDIF(WITH_OPENAL)
+  IF(WITH_OPENCOLLADA)
+    LINK_DIRECTORIES(${OPENCOLLADA_LIBPATH})
+    LINK_DIRECTORIES(${PCRE_LIBPATH})
+    LINK_DIRECTORIES(${EXPAT_LIBPATH})
+  ENDIF(WITH_OPENCOLLADA)
 
   IF(WIN32)
     LINK_DIRECTORIES(${PTHREADS_LIBPATH})
@@ -113,6 +118,11 @@
   IF(WITH_FFMPEG)
     TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB})
   ENDIF(WITH_FFMPEG)
+  IF(WITH_OPENCOLLADA)
+    TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
+    TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
+    TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
+  ENDIF(WITH_OPENCOLLADA)
   IF(WIN32)
     TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
   ENDIF(WIN32)

Modified: branches/soc-2009-chingachgook/CMakeLists.txt
===================================================================
--- branches/soc-2009-chingachgook/CMakeLists.txt	2009-09-17 23:05:33 UTC (rev 23318)
+++ branches/soc-2009-chingachgook/CMakeLists.txt	2009-09-17 23:17:31 UTC (rev 23319)
@@ -68,6 +68,7 @@
 OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
 OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
 OPTION(WITH_WEBPLUGIN		"Enable Web Plugin (Unix only)"				OFF)
+OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	ON)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
   MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -140,6 +141,19 @@
     SET(SDL_LIB ${SDL_LIBRARY})
   ENDIF(WITH_SDL)
 
+  IF(WITH_OPENCOLLADA)
+    SET(OPENCOLLADA /usr/local/opencollada)
+    SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
+    SET(OPENCOLLADA_LIB OpenCollada)
+    SET(PCRE /usr)
+    SET(PCRE_LIBPATH ${PCRE}/lib)
+    SET(PCRE_LIB pcre)
+    SET(EXPAT /usr)
+    SET(EXPAT_LIBPATH ${EXPAT}/lib)
+    SET(EXPAT_LIB expat)
+
+  ENDIF(WITH_OPENCOLLADA)
+
   FIND_PATH(OPENEXR_INC
     ImfXdr.h
     PATHS

Modified: branches/soc-2009-chingachgook/source/blender/CMakeLists.txt
===================================================================
--- branches/soc-2009-chingachgook/source/blender/CMakeLists.txt	2009-09-17 23:05:33 UTC (rev 23318)
+++ branches/soc-2009-chingachgook/source/blender/CMakeLists.txt	2009-09-17 23:17:31 UTC (rev 23319)
@@ -57,3 +57,7 @@
   ADD_SUBDIRECTORY(python)
 ENDIF(WITH_PYTHON)
 
+IF(WITH_OPENCOLLADA)
+  ADD_SUBDIRECTORY(collada)
+ENDIF(WITH_OPENCOLLADA)
+

Modified: branches/soc-2009-chingachgook/source/creator/CMakeLists.txt
===================================================================
--- branches/soc-2009-chingachgook/source/creator/CMakeLists.txt	2009-09-17 23:05:33 UTC (rev 23318)
+++ branches/soc-2009-chingachgook/source/creator/CMakeLists.txt	2009-09-17 23:17:31 UTC (rev 23319)
@@ -241,6 +241,7 @@
     bf_openexr 
     bf_dds
     bf_readblenfile 
+    bf_collada
     blender_bop 
     bf_kernel 
     bf_decimation