[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16839] trunk/blender/source: WITH_ELBEEM diabled wasnt working with cmake

Campbell Barton ideasman42 at gmail.com
Tue Sep 30 07:05:50 CEST 2008


Revision: 16839
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16839
Author:   campbellbarton
Date:     2008-09-30 07:05:50 +0200 (Tue, 30 Sep 2008)

Log Message:
-----------
WITH_ELBEEM diabled wasnt working with cmake

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/CMakeLists.txt
    trunk/blender/source/blender/src/CMakeLists.txt
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt	2008-09-30 04:17:39 UTC (rev 16838)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt	2008-09-30 05:05:50 UTC (rev 16839)
@@ -73,3 +73,6 @@
    ADD_DEFINITIONS(-DWITH_FREETYPE2)
 ENDIF(WITH_INTERNATIONAL)
 
+IF(NOT WITH_ELBEEM)
+  ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+ENDIF(NOT WITH_ELBEEM)

Modified: trunk/blender/source/blender/src/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/src/CMakeLists.txt	2008-09-30 04:17:39 UTC (rev 16838)
+++ trunk/blender/source/blender/src/CMakeLists.txt	2008-09-30 05:05:50 UTC (rev 16839)
@@ -80,3 +80,6 @@
   ADD_DEPENDENCIES(src mkprot verse)
 ENDIF(WITH_VERSE)
 
+IF(NOT WITH_ELBEEM)
+  ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+ENDIF(NOT WITH_ELBEEM)

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2008-09-30 04:17:39 UTC (rev 16838)
+++ trunk/blender/source/creator/CMakeLists.txt	2008-09-30 05:05:50 UTC (rev 16839)
@@ -187,8 +187,12 @@
 
 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 bf_elbeem)
+SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} src blender_python blender_render blender_radiosity)
 
+IF(WITH_ELBEEM)
+  SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_elbeem)
+ENDIF(WITH_ELBEEM)
+
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")





More information about the Bf-blender-cvs mailing list