1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110
|
From: Santiago Vila <sanvila@debian.org>
Andreas Tille <tille@debian.org>
Subject: Build with boost 1.90
Bug-Debian: https://bugs.debian.org/1127235
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -249,7 +249,7 @@ MACRO(GET_BOOST_LINKERFLAG VAR LIBNAMES)
SET(${VAR} "${flags}")
ENDMACRO(GET_BOOST_LINKERFLAG)
-SET(BOOST_COMPONENTS filesystem unit_test_framework serialization system)
+SET(BOOST_COMPONENTS filesystem unit_test_framework serialization)
IF (MIA_USE_BOOST_REGEX)
SET(BOOST_COMPONENTS ${BOOST_COMPONENTS} regex)
--- a/mia/core/searchpath.cc
+++ b/mia/core/searchpath.cc
@@ -25,6 +25,8 @@
#include <sstream>
#include <cstdlib>
#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
+/* Perhaps its easier to #include <boost/filesystem.hpp> */
#include <config.h>
--- a/mia/core/test_register.cc
+++ b/mia/core/test_register.cc
@@ -21,8 +21,7 @@
#include <climits>
#define BOOST_TEST_DYN_LINK
-#include <boost/filesystem/convenience.hpp>
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
#include <boost/test/unit_test_suite.hpp>
#include <boost/test/unit_test.hpp>
--- a/addons/openexr/test_openexr.cc
+++ b/addons/openexr/test_openexr.cc
@@ -19,8 +19,7 @@
*/
#include <mia/internal/autotest.hh>
-#include <boost/filesystem/convenience.hpp>
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
#include <mia/2d/imageio.hh>
#include <mia/2d/imageiotest.hh>
#include <mia/2d/vfio.hh>
--- a/mia/2d/test_vfio.cc
+++ b/mia/2d/test_vfio.cc
@@ -20,8 +20,7 @@
#include <cstdlib>
-#include <boost/filesystem/convenience.hpp>
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
#include <boost/test/unit_test_suite.hpp>
#include <boost/test/unit_test.hpp>
--- a/mia/2d/vfiotest.cc
+++ b/mia/2d/vfiotest.cc
@@ -21,8 +21,7 @@
#include <cstdlib>
#include <climits>
-#include <boost/filesystem/convenience.hpp>
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
#include <boost/test/unit_test_suite.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/test/parameterized_test.hpp>
--- a/mia/3d/imageiotest.cc
+++ b/mia/3d/imageiotest.cc
@@ -24,8 +24,7 @@
#include <boost/test/unit_test.hpp>
#include <boost/test/parameterized_test.hpp>
-#include <boost/filesystem/convenience.hpp>
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
#include <mia/core/msgstream.hh>
#include <mia/core/history.hh>
--- a/mia/3d/test_vfio.cc
+++ b/mia/3d/test_vfio.cc
@@ -24,8 +24,7 @@
#include <boost/test/unit_test_suite.hpp>
#include <boost/test/unit_test.hpp>
-#include <boost/filesystem/convenience.hpp>
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
#include <mia/3d/vfio.hh>
#include <mia/3d/vfiotest.hh>
--- a/src/3dbrainextractT1.cc
+++ b/src/3dbrainextractT1.cc
@@ -28,7 +28,7 @@
//#include <dlfcn.h>
#include <algorithm>
-#include <boost/filesystem/convenience.hpp>
+#include <boost/filesystem.hpp>
#include <mia/3d/fuzzyseg.hh>
|