change MIN_boost_version

ubuntu version 20.04 is no longer supported. The minimum boost version used for freecad is now 1.74 (ubuntu 22.04) https://launchpad.net/ubuntu/jammy/+package/libboost-system-dev
2025-02-15 14:02:43 +01:00
parent 0931abe4d5
commit 146d8a356b
50 changed files with 48 additions and 77 deletions
--- a/cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake
+++ b/cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake
@@ -17,9 +17,9 @@ macro(CompilerChecksAndSetups)
        add_definitions(-DHAVE_SNPRINTF)
    endif()

-    # Allow developers to use Boost < 1.65
+    # Allow developers to use Boost < 1.74
    if (NOT BOOST_MIN_VERSION)
-        set(BOOST_MIN_VERSION 1.65)
+        set(BOOST_MIN_VERSION 1.74)
    endif()

    # For older cmake versions the variable 'CMAKE_CXX_COMPILER_VERSION' is missing
--- a/src/App/Application.h
+++ b/src/App/Application.h
@@ -24,7 +24,7 @@
 #ifndef APP_APPLICATION_H
 #define APP_APPLICATION_H

-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include <deque>
 #include <vector>
--- a/src/App/DocumentObserver.h
+++ b/src/App/DocumentObserver.h
@@ -26,7 +26,7 @@

 #include <Base/BaseClass.h>
 #include <Base/Bitmask.h>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #include <memory>
 #include <set>
 #include <FCGlobal.h>
--- a/src/App/PreCompiled.h
+++ b/src/App/PreCompiled.h
@@ -89,7 +89,7 @@

 // Boost
 #include <boost_graph_adjacency_list.hpp>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include <boost/program_options.hpp>
 #include <boost/regex.hpp>
--- a/src/App/PropertyExpressionEngine.h
+++ b/src/App/PropertyExpressionEngine.h
@@ -25,7 +25,7 @@

 #include <functional>
 #include <boost/unordered/unordered_map.hpp>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #include <boost_graph_adjacency_list.hpp>
 #include <boost/graph/topological_sort.hpp>
 #include <App/PropertyLinks.h>
--- a/src/Base/Parameter.h
+++ b/src/Base/Parameter.h
@@ -51,7 +51,7 @@ using PyObject = struct _object;

 #include <map>
 #include <vector>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #include <xercesc/util/XercesDefs.hpp>

 #include "Handle.h"
--- a/src/Base/Tools.h
+++ b/src/Base/Tools.h
@@ -33,7 +33,7 @@
 #include <iostream>
 #include <vector>
 #include <string>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #include <QString>

 // ----------------------------------------------------------------------------
--- a/src/Gui/AutoSaver.h
+++ b/src/Gui/AutoSaver.h
@@ -29,7 +29,7 @@
 #include <map>
 #include <set>
 #include <string>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #include <Base/Writer.h>

 namespace App {
--- a/src/Gui/Command.h
+++ b/src/Gui/Command.h
@@ -28,7 +28,7 @@
 #include <map>
 #include <string>
 #include <vector>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include <Base/Type.h>
 #include <Gui/Application.h>
--- a/src/Gui/DAGView/DAGModel.h
+++ b/src/Gui/DAGView/DAGModel.h
@@ -26,7 +26,7 @@
 #include <memory>
 #include <vector>

-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include <QBrush>
 #include <QGraphicsScene>
--- a/src/Gui/DAGView/DAGModelGraph.h
+++ b/src/Gui/DAGView/DAGModelGraph.h
@@ -35,7 +35,7 @@
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/member.hpp>
 #include <boost/multi_index/ordered_index.hpp>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include "DAGRectItem.h"

--- a/src/Gui/DAGView/DAGView.h
+++ b/src/Gui/DAGView/DAGView.h
@@ -25,7 +25,7 @@

 #include <memory>
 #include <QGraphicsView>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include <Gui/DockWindow.h>
 #include <Gui/Document.h>
--- a/src/Gui/Document.h
+++ b/src/Gui/Document.h
@@ -26,7 +26,7 @@
 #include <list>
 #include <map>
 #include <string>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #include <QString>

 #include <Base/Persistence.h>
--- a/src/Gui/DocumentObserver.h
+++ b/src/Gui/DocumentObserver.h
@@ -24,7 +24,7 @@
 #define GUI_DOCUMENTOBSERVER_H

 #include <Base/BaseClass.h>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>


 namespace App { class Property; }
--- a/src/Gui/ExpressionBinding.h
+++ b/src/Gui/ExpressionBinding.h
@@ -27,7 +27,7 @@
 #include <string>
 #include <App/ObjectIdentifier.h>
 #include <QPalette>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>


 namespace App {
--- a/src/Gui/MDIView.cpp
+++ b/src/Gui/MDIView.cpp
@@ -23,7 +23,7 @@
 #include "PreCompiled.h"

 #ifndef _PreComp_
-# include <boost_signals2.hpp>
+# include <boost/signals2.hpp>
 # include <boost/core/ignore_unused.hpp>
 # include <QApplication>
 # include <QEvent>
--- a/src/Gui/MDIView.h
+++ b/src/Gui/MDIView.h
@@ -23,7 +23,7 @@
 #ifndef GUI_MDIVIEW_H
 #define GUI_MDIVIEW_H

-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #include <QMainWindow>
 #include <Gui/ActiveObjectList.h>
 #include <Gui/View.h>
--- a/src/Gui/ParamHandler.h
+++ b/src/Gui/ParamHandler.h
@@ -24,7 +24,7 @@

 #include <map>
 #include <memory>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #include <QTimer>

 #include <FCGlobal.h>
--- a/src/Gui/PreCompiled.h
+++ b/src/Gui/PreCompiled.h
@@ -82,7 +82,7 @@

 // Boost
 #include <boost_graph_adjacency_list.hpp>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/bind/bind.hpp>
 #include <boost/core/ignore_unused.hpp>
--- a/src/Gui/ToolBarAreaWidget.h
+++ b/src/Gui/ToolBarAreaWidget.h
@@ -26,7 +26,7 @@
 #include <QToolBar>
 #include <QPointer>
 #include <QWidget>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #include <Base/Parameter.h>

 namespace Gui
--- a/src/Gui/ToolBarManager.h
+++ b/src/Gui/ToolBarManager.h
@@ -25,7 +25,7 @@
 #define GUI_TOOLBARMANAGER_H

 #include <string>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include <QStringList>
 #include <QPointer>
--- a/src/Gui/ViewProvider.h
+++ b/src/Gui/ViewProvider.h
@@ -28,7 +28,7 @@
 #include <string>
 #include <vector>
 #include <QIcon>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #include <boost/intrusive_ptr.hpp>

 #include <App/Material.h>
--- a/src/Mod/CAM/App/Area.cpp
+++ b/src/Mod/CAM/App/Area.cpp
@@ -28,7 +28,7 @@
 #ifndef _PreComp_
 #include <cfloat>

-#include <boost_geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/register/point.hpp>
 #include <boost/geometry/index/rtree.hpp>
 #include <boost/range/adaptor/transformed.hpp>
--- a/src/Mod/CAM/libarea/PythonStuff.cpp
+++ b/src/Mod/CAM/libarea/PythonStuff.cpp
@@ -32,10 +32,8 @@

 #define BOOST_BIND_GLOBAL_PLACEHOLDERS

-// #include <boost/progress.hpp>
-// #include <boost/timer.hpp>
 #include <boost/foreach.hpp>
-#include <boost_python.hpp>
+#include <boost/python.hpp>
 #include <boost/python/module.hpp>
 #include <boost/python/class.hpp>
 #include <boost/python/wrapper.hpp>
--- a/src/Mod/Drawing/Gui/TaskOrthoViews.h
+++ b/src/Mod/Drawing/Gui/TaskOrthoViews.h
@@ -28,7 +28,7 @@

 #include <QCheckBox>

-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include <Base/BoundBox.h>
 #include <Gui/TaskView/TaskDialog.h>
--- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h
@@ -25,7 +25,7 @@

 #include <Inventor/SbBox3f.h>
 #include <QWidget>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include <Gui/ViewProviderDocumentObject.h>
 #include <Mod/Fem/App/FemPostFunction.h>
--- a/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp
+++ b/src/Mod/Material/Gui/DlgDisplayPropertiesImp.cpp
@@ -24,7 +24,7 @@
 #ifndef _PreComp_
 #include <QSignalBlocker>
 #include <algorithm>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #endif

 #include <Base/Console.h>
--- a/src/Mod/Material/Gui/DlgMaterialImp.cpp
+++ b/src/Mod/Material/Gui/DlgMaterialImp.cpp
@@ -26,7 +26,7 @@
 #include <QSignalBlocker>
 #include <QString>
 #include <algorithm>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #endif

 #include <Base/Console.h>
--- a/src/Mod/Part/App/WireJoiner.cpp
+++ b/src/Mod/Part/App/WireJoiner.cpp
@@ -59,7 +59,7 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <deque>
-#include <boost_geometry.hpp>
+#include <boost/geometry.hpp>
 #include <utility>

 #include <Base/Console.h>
--- a/src/Mod/Sketcher/App/PreCompiled.h
+++ b/src/Mod/Sketcher/App/PreCompiled.h
@@ -53,7 +53,7 @@
 #include <boost/random.hpp>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/uuid/uuid_io.hpp>
-#include <boost_geometry.hpp>
+#include <boost/geometry.hpp>

 // OpenCasCade
 #include <BRepAdaptor_Curve.hxx>
--- a/src/Mod/Sketcher/App/PropertyConstraintList.h
+++ b/src/Mod/Sketcher/App/PropertyConstraintList.h
@@ -27,7 +27,7 @@
 #include <vector>

 #include <boost/unordered/unordered_map.hpp>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include <App/Property.h>
 #include <Mod/Part/App/Geometry.h>
--- a/src/Mod/Sketcher/App/SketchObject.cpp
+++ b/src/Mod/Sketcher/App/SketchObject.cpp
@@ -74,7 +74,7 @@
 #include <boost/iostreams/device/array.hpp>
 #include <boost/iostreams/stream.hpp>
 #include <boost/range/adaptor/map.hpp>
-#include <boost_geometry.hpp>
+#include <boost/geometry.hpp>

 #endif

--- a/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.h
+++ b/src/Mod/Sketcher/Gui/SketcherToolDefaultWidget.h
@@ -28,7 +28,7 @@
 #include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/Selection/Selection.h>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>


 class QComboBox;
--- a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h
+++ b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h
@@ -23,7 +23,7 @@
 #ifndef SKETCHERGUI_TaskDlgEditSketch_H
 #define SKETCHERGUI_TaskDlgEditSketch_H

-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include <Gui/TaskView/TaskDialog.h>

--- a/src/Mod/Sketcher/Gui/TaskSketcherElements.h
+++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.h
@@ -26,7 +26,7 @@
 #include <QListWidget>
 #include <QStyledItemDelegate>

-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include <Gui/Selection/Selection.h>
 #include <Gui/TaskView/TaskView.h>
--- a/src/Mod/Sketcher/Gui/TaskSketcherMessages.h
+++ b/src/Mod/Sketcher/Gui/TaskSketcherMessages.h
@@ -23,7 +23,7 @@
 #ifndef GUI_TASKVIEW_TaskSketcherMessages_H
 #define GUI_TASKVIEW_TaskSketcherMessages_H

-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include <Gui/TaskView/TaskView.h>

--- a/src/Mod/Sketcher/Gui/TaskSketcherTool.h
+++ b/src/Mod/Sketcher/Gui/TaskSketcherTool.h
@@ -27,7 +27,7 @@
 #include <Gui/TaskView/TaskView.h>
 #include <Gui/TaskView/TaskDialog.h>
 #include <Gui/Selection/Selection.h>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 namespace App
 {
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.h
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.h
@@ -26,7 +26,7 @@
 #include <Inventor/SoRenderManager.h>
 #include <Inventor/sensors/SoNodeSensor.h>
 #include <QCoreApplication>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #include <memory>

 #include <Base/Parameter.h>
--- a/src/Mod/TechDraw/App/DrawPage.h
+++ b/src/Mod/TechDraw/App/DrawPage.h
@@ -23,7 +23,7 @@
 #ifndef DrawPage_h_
 #define DrawPage_h_

-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include <App/DocumentObject.h>
 #include <App/PropertyStandard.h>
--- a/src/Mod/TechDraw/App/DrawView.h
+++ b/src/Mod/TechDraw/App/DrawView.h
@@ -23,7 +23,7 @@
 #ifndef DrawView_h_
 #define DrawView_h_

-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #include <QCoreApplication>
 #include <QRectF>

--- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
@@ -37,7 +37,7 @@
 #include <QPrintDialog>
 #include <QPrintPreviewDialog>
 #include <QPrinter>
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #include <cmath>
 #endif

--- a/src/Mod/TechDraw/Gui/QGIView.h
+++ b/src/Mod/TechDraw/Gui/QGIView.h
@@ -25,7 +25,7 @@

 #include <Mod/TechDraw/TechDrawGlobal.h>

-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include <QColor>
 #include <QFont>
--- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp
@@ -24,7 +24,7 @@
 #include "PreCompiled.h"

 #ifndef _PreComp_
-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>
 #include <boost/signals2/connection.hpp>
 #endif

--- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h
@@ -26,7 +26,7 @@

 #include <Mod/TechDraw/TechDrawGlobal.h>

-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include <Gui/ViewProviderDocumentObject.h>
 #include <Mod/TechDraw/App/DrawView.h>
--- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
+++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp
@@ -30,7 +30,7 @@
 # include <QPointer>
 # include <QTextStream>

-# include <boost_signals2.hpp>
+# include <boost/signals2.hpp>
 # include <boost/signals2/connection.hpp>
 #endif

--- a/src/Mod/TechDraw/Gui/ViewProviderPage.h
+++ b/src/Mod/TechDraw/Gui/ViewProviderPage.h
@@ -27,7 +27,7 @@
 #include <QObject>
 #include <QPointer>

-#include <boost_signals2.hpp>
+#include <boost/signals2.hpp>

 #include <App/PropertyUnits.h>
 #include <Gui/ViewProviderDocumentObject.h>
--- a/src/Tools/params_utils.py
+++ b/src/Tools/params_utils.py
@@ -81,7 +81,7 @@ def declare_begin(module, header=True):
            f"""
 {trace_comment()}
 #include <Base/Parameter.h>
-{"#include <boost_signals2.hpp>" if signal else ""}
+{"#include <boost/signals2.hpp>" if signal else ""}
 """
        )

--- a/src/boost_geometry.hpp
+++ b/src/boost_geometry.hpp
@@ -1,9 +0,0 @@
-#ifndef FREECAD_GEOMETRY_HPP_WORKAROUND
-#define FREECAD_GEOMETRY_HPP_WORKAROUND
-
-// Workaround for boost >= 1.74
-#define BOOST_ALLOW_DEPRECATED_HEADERS
-#include <boost/geometry.hpp>
-#undef BOOST_ALLOW_DEPRECATED_HEADERS
-
-#endif // #ifndef FREECAD_GEOMETRY_HPP_WORKAROUND
--- a/src/boost_python.hpp
+++ b/src/boost_python.hpp
@@ -1,9 +0,0 @@
-#ifndef FREECAD_BOOST_PYTHON_HPP_WORKAROUND
-#define FREECAD_BOOST_PYTHON_HPP_WORKAROUND
-
-// Workaround for boost >= 1.74
-#define BOOST_ALLOW_DEPRECATED_HEADERS
-#include <boost/python.hpp>
-#undef BOOST_ALLOW_DEPRECATED_HEADERS
-
-#endif // #ifndef FREECAD_BOOST_PYTHON_HPP_WORKAROUND
--- a/src/boost_signals2.hpp
+++ b/src/boost_signals2.hpp
@@ -1,9 +0,0 @@
-#ifndef FREECAD_SIGNALS2_HPP_WORKAROUND
-#define FREECAD_SIGNALS2_HPP_WORKAROUND
-
-// Workaround for boost >= 1.74
-#define BOOST_ALLOW_DEPRECATED_HEADERS
-#include <boost/signals2.hpp>
-#undef BOOST_ALLOW_DEPRECATED_HEADERS
-
-#endif // #ifndef FREECAD_SIGNALS2_HPP_WORKAROUND