[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43301] branches/carve_booleans: Carve booleans: fix for HAVE_BOOST_UNORDERED_COLLECTIONS redefinition

[Sergey Sharybin]

Revision: 43301
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43301
Author:   nazgul
Date:     2012-01-11 15:18:25 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
Carve booleans: fix for HAVE_BOOST_UNORDERED_COLLECTIONS redefinition

Carve is always using boost when compiling by MSVC due to it's much faster.
Do not define this symbol from building rules to prevent redefining warning
message caused by Carve's boost policy.

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

Modified: branches/carve_booleans/extern/carve/CMakeLists.txt
===================================================================
--- branches/carve_booleans/extern/carve/CMakeLists.txt	2012-01-11 15:16:48 UTC (rev 43300)
+++ branches/carve_booleans/extern/carve/CMakeLists.txt	2012-01-11 15:18:25 UTC (rev 43301)
@@ -147,17 +147,17 @@
 )
 
 if(WITH_BOOST)
-	add_definitions(
-		-DCARVE_SYSTEM_BOOST
-	)
-
 	if(NOT MSVC)
-		# Boost is setting as preferred collections library in the Carve code
+		# Boost is setting as preferred collections library in the Carve code when using MSVC compiler
 		add_definitions(
 			-DHAVE_BOOST_UNORDERED_COLLECTIONS
 		)
 	endif()
 
+	add_definitions(
+		-DCARVE_SYSTEM_BOOST
+	)
+
 	list(APPEND INC
 		${BOOST_INCLUDE_DIR}
 	)

Modified: branches/carve_booleans/extern/carve/SConscript
===================================================================
--- branches/carve_booleans/extern/carve/SConscript	2012-01-11 15:16:48 UTC (rev 43300)
+++ branches/carve_booleans/extern/carve/SConscript	2012-01-11 15:18:25 UTC (rev 43301)
@@ -13,7 +13,7 @@
 
 if env['WITH_BF_BOOST']:
     if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
-        # Boost is setting as preferred collections library in the Carve code
+        # Boost is setting as preferred collections library in the Carve code when using MSVC compiler
         defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
 
     defs.append('CARVE_SYSTEM_BOOST')

Modified: branches/carve_booleans/extern/carve/bundle.sh
===================================================================
--- branches/carve_booleans/extern/carve/bundle.sh	2012-01-11 15:16:48 UTC (rev 43300)
+++ branches/carve_booleans/extern/carve/bundle.sh	2012-01-11 15:18:25 UTC (rev 43301)
@@ -78,17 +78,17 @@
 )
 
 if(WITH_BOOST)
-	add_definitions(
-		-DCARVE_SYSTEM_BOOST
-	)
-
 	if(NOT MSVC)
-		# Boost is setting as preferred collections library in the Carve code
+		# Boost is setting as preferred collections library in the Carve code when using MSVC compiler
 		add_definitions(
 			-DHAVE_BOOST_UNORDERED_COLLECTIONS
 		)
 	endif()
 
+	add_definitions(
+		-DCARVE_SYSTEM_BOOST
+	)
+
 	list(APPEND INC
 		\${BOOST_INCLUDE_DIR}
 	)
@@ -113,7 +113,7 @@
 
 if env['WITH_BF_BOOST']:
     if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
-        # Boost is setting as preferred collections library in the Carve code
+        # Boost is setting as preferred collections library in the Carve code when using MSVC compiler
         defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
 
     defs.append('CARVE_SYSTEM_BOOST')

Modified: branches/carve_booleans/intern/boolop/CMakeLists.txt
===================================================================
--- branches/carve_booleans/intern/boolop/CMakeLists.txt	2012-01-11 15:16:48 UTC (rev 43300)
+++ branches/carve_booleans/intern/boolop/CMakeLists.txt	2012-01-11 15:18:25 UTC (rev 43301)
@@ -89,8 +89,14 @@
 	)
 
 	if(WITH_BOOST)
+		if(NOT MSVC)
+			# Boost is setting as preferred collections library in the Carve code when using MSVC compiler
+			add_definitions(
+				-DHAVE_BOOST_UNORDERED_COLLECTIONS
+			)
+		endif()
+
 		add_definitions(
-			-DHAVE_BOOST_UNORDERED_COLLECTIONS
 			-DCARVE_SYSTEM_BOOST
 		)
 

Modified: branches/carve_booleans/intern/boolop/SConscript
===================================================================
--- branches/carve_booleans/intern/boolop/SConscript	2012-01-11 15:16:48 UTC (rev 43300)
+++ branches/carve_booleans/intern/boolop/SConscript	2012-01-11 15:18:25 UTC (rev 43301)
@@ -15,7 +15,10 @@
     incs += ' ../../extern/carve/include'
 
     if env['WITH_BF_BOOST']:
-        defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
+        if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
+            # Boost is setting as preferred collections library in the Carve code when using MSVC compiler
+            defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
+
         defs.append('CARVE_SYSTEM_BOOST')
         incs +=  ' ' + env['BF_BOOST_INC']