TD: [skip ci] fix build failure with boost >= 1.78 on Windows
This commit is contained in:
@@ -34,7 +34,7 @@
|
||||
#include <TopoDS_Wire.hxx>
|
||||
#endif
|
||||
|
||||
#include <boost/regex.hpp>
|
||||
#include <boost_regex.hpp>
|
||||
|
||||
#include <App/DocumentObject.h>
|
||||
#include <App/DocumentObjectPy.h>
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <cstring>
|
||||
#include <sstream>
|
||||
|
||||
#include <boost/regex.hpp>
|
||||
#include <boost_regex.hpp>
|
||||
|
||||
#include <QChar>
|
||||
#include <QPointF>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#ifndef _PreComp_
|
||||
#include <iomanip>
|
||||
#include <sstream>
|
||||
#include <boost/regex.hpp>
|
||||
#include <boost_regex.hpp>
|
||||
#endif
|
||||
|
||||
#include <App/Property.h>
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
// boost
|
||||
#include <boost/graph/boyer_myrvold_planar_test.hpp>
|
||||
#include <boost/graph/is_kuratowski_subgraph.hpp>
|
||||
#include <boost/regex.hpp>
|
||||
#include <boost_regex.hpp>
|
||||
#include <boost/uuid/uuid.hpp>
|
||||
#include <boost/uuid/uuid_generators.hpp>
|
||||
#include <boost/uuid/uuid_io.hpp>
|
||||
|
||||
16
src/boost_regex.hpp
Normal file
16
src/boost_regex.hpp
Normal file
@@ -0,0 +1,16 @@
|
||||
#ifndef FREECAD_REGEX_HPP_WORKAROUND
|
||||
#define FREECAD_REGEX_HPP_WORKAROUND
|
||||
|
||||
#include <boost/version.hpp>
|
||||
|
||||
#if BOOST_VERSION >= 107800
|
||||
|
||||
// Workaround for boost >= 1.78
|
||||
#ifdef WIN32
|
||||
#include <Windows.h>
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#include <boost/regex.hpp>
|
||||
|
||||
#endif // #ifndef FREECAD_REGEX_HPP_WORKAROUND
|
||||
Reference in New Issue
Block a user