[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42629] branches/carve_booleans: Carve booleans: update build system rules

[Sergey Sharybin]

Revision: 42629
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42629
Author:   nazgul
Date:     2011-12-14 12:12:36 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Carve booleans: update build system rules
- Carve wasn't been used by scons before
- Attempt to switch to boost unordered collection, strange things started
  happening with CSG constructor, so commented this changes for a while

Modified Paths:
--------------
    branches/carve_booleans/CMakeLists.txt
    branches/carve_booleans/extern/carve/CMakeLists.txt
    branches/carve_booleans/extern/carve/SConscript
    branches/carve_booleans/intern/boolop/SConscript

Modified: branches/carve_booleans/CMakeLists.txt
===================================================================
--- branches/carve_booleans/CMakeLists.txt	2011-12-14 10:29:41 UTC (rev 42628)
+++ branches/carve_booleans/CMakeLists.txt	2011-12-14 12:12:36 UTC (rev 42629)
@@ -299,9 +299,13 @@
 	set(WITH_HEADLESS ON)
 endif()
 
-# auto enable openimageio and boost for cycles
+# auto enable openimageio for cycles
 if(WITH_CYCLES)
 	set(WITH_OPENIMAGEIO ON)
+endif()
+
+# auto enable boost for cycles and carve
+if(WITH_CYCLES OR WITH_CARVE)
 	set(WITH_BOOST ON)
 endif()
 

Modified: branches/carve_booleans/extern/carve/CMakeLists.txt
===================================================================
--- branches/carve_booleans/extern/carve/CMakeLists.txt	2011-12-14 10:29:41 UTC (rev 42628)
+++ branches/carve_booleans/extern/carve/CMakeLists.txt	2011-12-14 12:12:36 UTC (rev 42629)
@@ -145,4 +145,16 @@
 	include/carve/collection_types.hpp
 )
 
+# TODO: not supported yet
+#if(WITH_BOOST)
+#	add_definitions(
+#		-DHAVE_BOOST_UNORDERED_COLLECTIONS
+#		-DCARVE_SYSTEM_BOOST
+#	)
+#
+#	list(APPEND INC
+#		${BOOST_INCLUDE_DIR}
+#	)
+#endif()
+
 blender_add_lib(extern_carve "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/carve_booleans/extern/carve/SConscript
===================================================================
--- branches/carve_booleans/extern/carve/SConscript	2011-12-14 10:29:41 UTC (rev 42628)
+++ branches/carve_booleans/extern/carve/SConscript	2011-12-14 12:12:36 UTC (rev 42629)
@@ -3,7 +3,13 @@
 
 sources = env.Glob('lib/*.cpp')
 
-defs = ''
-incs = 'include'
+defs = []
+incs = ['include']
 
-env.BlenderLib ('extern_carve', Split(sources), Split(incs), Split(defs), libtype=['extern'], priority=[40] )
+# TODO: not supported yet
+#if env['WITH_BF_BOOST']:
+#    defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
+#    defs.append('CARVE_SYSTEM_BOOST')
+#    incs.append(env['BF_BOOST_INC'])
+
+env.BlenderLib ('extern_carve', Split(sources), incs, defs, libtype=['extern'], priority=[40] )

Modified: branches/carve_booleans/intern/boolop/SConscript
===================================================================
--- branches/carve_booleans/intern/boolop/SConscript	2011-12-14 10:29:41 UTC (rev 42628)
+++ branches/carve_booleans/intern/boolop/SConscript	2011-12-14 12:12:36 UTC (rev 42629)
@@ -1,13 +1,17 @@
 #!/usr/bin/python
 Import ('env')
 
-sources = env.Glob('intern/*.cpp')
-
 incs = '. intern extern ../moto/include ../container ../memutil'
 incs += ' ../../source/blender/makesdna ../../intern/guardedalloc'
 incs += ' ../../source/blender/blenlib'
-incs += ' ../../extern/carve/include'
 
+if not env['WITH_BF_CARVE']:
+    sources = env.Glob('intern/*.cpp')
+    sources.remove('intern' + os.sep + 'BOP_CarveInterface.cpp')
+else:
+    sources = env.Glob('intern/BOP_CarveInterface.cpp')
+    incs += ' ../../extern/carve/include'
+
 if (env['OURPLATFORM'] == 'win32-mingw'):
     env.BlenderLib ('bf_intern_bop', sources, Split(incs) , [], libtype='intern', priority = 5 )
 else: