Fix boost::any bug with Boost 1.54.

and set BOOST_MIN_VERSION to 1.48. Fixes: - http://freecadweb.org/tracker/view.php?id=0002505 - http://forum.freecadweb.org/viewtopic.php?f=13&t=15310 - http://forum.freecadweb.org/viewtopic.php?f=3&t=15400 - http://forum.freecadweb.org/viewtopic.php?f=10&t=14108
FreeCAD · May 2, 2016 · 1e061b5 · 1e061b5
1 parent 5edeb99
commit 1e061b5
Show file tree

Hide file tree

Showing 7 changed files with 378 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,11 +50,10 @@ endif (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
 
 # ================================================================================
 
-# Issues with boost::any on older versions with C++11 enabled.
-set(BOOST_MIN_VERSION 1.55)
-IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_COMPILER_VERSION VERSION_LESS 4.7)
-   UNSET(BOOST_MIN_VERSION) # For Ubuntu 12.04
-ENDIF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_COMPILER_VERSION VERSION_LESS 4.7)
+# Allow developers to use Boost < 1.48
+if(NOT ${BOOST_MIN_VERSION})
+   set(BOOST_MIN_VERSION 1.48)
+endif()
 
 # Enabled C++11 for Freecad 0.17 and later
 IF(FREECAD_VERSION VERSION_GREATER 0.16)

diff --git a/src/App/CMakeLists.txt b/src/App/CMakeLists.txt
@@ -12,6 +12,8 @@ IF(DOCDIR)
     add_definitions(-DDOCDIR="${DOCDIR}")
 ENDIF(DOCDIR)
 
+add_definitions(-DBOOST_${Boost_VERSION})
+
 include_directories(
     ${CMAKE_BINARY_DIR}/src
     ${CMAKE_SOURCE_DIR}/src

diff --git a/src/App/ObjectIdentifier.h b/src/App/ObjectIdentifier.h
@@ -26,7 +26,11 @@
 
 #include <vector>
 #include <string>
+#ifndef BOOST_105400
 #include <boost/any.hpp>
+#else
+#include <boost_any_1_55.hpp>
+#endif
 
 namespace App
 {

diff --git a/src/App/Property.h b/src/App/Property.h
@@ -27,7 +27,11 @@
 // Std. configurations
 
 #include <Base/Persistence.h>
-#include <boost/any.hpp>
+#ifndef BOOST_105400
+#include <boost/any.hpp>
+#else
+#include <boost_any_1_55.hpp>
+#endif
 #include <string>
 #include <bitset>
 

diff --git a/src/Mod/Assembly/App/CMakeLists.txt b/src/Mod/Assembly/App/CMakeLists.txt
@@ -4,6 +4,8 @@ else(MSVC)
     add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
 endif(MSVC)
 
+add_definitions(-DBOOST_${Boost_VERSION})
+
 include_directories(
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_BINARY_DIR}/src

diff --git a/src/Mod/Assembly/App/opendcm/core/constraint.hpp b/src/Mod/Assembly/App/opendcm/core/constraint.hpp
@@ -32,7 +32,11 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/for_each.hpp>
 
+#ifndef BOOST_105400
 #include <boost/any.hpp>
+#else
+#include <boost_any_1_55.hpp>
+#endif
 #include <boost/fusion/include/as_vector.hpp>
 
 #include <boost/preprocessor.hpp>