Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9bc74b9

Browse files
authored
Merge pull request#581 from norlab-ulaval/leave-boost-filesystem
Leave boost filesystem
2 parentsbafdda9 +1b37e6f commit9bc74b9

File tree

19 files changed

+135
-181
lines changed

19 files changed

+135
-181
lines changed

‎.github/workflows/build-python.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ jobs:
163163
libopenmpt:x64-windows `
164164
boost-mpi:x64-windows-static `
165165
boost-thread:x64-windows-static `
166-
boost-filesystem:x64-windows-static `
167166
boost-system:x64-windows-static `
168167
boost-program-options:x64-windows-static `
169168
boost-date-time:x64-windows-static `
@@ -185,7 +184,7 @@ jobs:
185184
if:${{ steps.cache-boost.outputs.cache-hit != 'true' && runner.os == 'Linux' }}
186185
working-directory:${{ env.BOOST_SRC_DIR }}/${{ env.BOOST_DIR }}
187186
run:|
188-
./bootstrap.sh --with-libraries=thread,filesystem,system,program_options,date_time,chrono --with-icu --prefix=${{ env.BOOST_INSTALL_PATH }}
187+
./bootstrap.sh --with-libraries=thread,system,program_options,date_time,chrono --with-icu --prefix=${{ env.BOOST_INSTALL_PATH }}
189188
./b2 cxxflags=-fPIC cflags=-fPIC link=static install
190189
191190
-name:Download source code libnabo ${{ env.LIBNABO_VERSION }}

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ endif()
126126
#--------------------
127127
# DEPENDENCY: boost
128128
#--------------------
129-
find_package(Boost REQUIRED COMPONENTS threadfilesystemsystem program_options date_time)
129+
find_package(Boost REQUIRED COMPONENTS threadsystem program_options date_time)
130130
if (Boost_MINOR_VERSIONGREATER 47)
131-
find_package(Boost REQUIRED COMPONENTS threadfilesystemsystem program_options date_time chrono)
131+
find_package(Boost REQUIRED COMPONENTS threadsystem program_options date_time chrono)
132132
endif ()
133133

134134
#--------------------

‎doc/LinkingProjects.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ A working example of how to link to an external project can be found in [./examp
2323

2424
##Option 2: Using Eclipse
2525

26-
We will demonstrate how to create an Eclipse project containing a simple executable which depends on libpointmatcher. You must have[Eclipse CDT](http://www.eclipse.org/cdt/) installed to develop with libpointmatcher in Eclipse.
26+
We will demonstrate how to create an Eclipse project containing a simple executable which depends on libpointmatcher. You must have[Eclipse CDT](http://www.eclipse.org/cdt/) installed to develop with libpointmatcher in Eclipse.
2727

28-
Create a new C++ project by clicking`File > New > C++ Project`. You can name your project "PointmatcherEclipseDemo" and in toolchains select the default toolchain for your system (most likely Linux GCC). Click`Finish` to add your project to your Eclipse workspace.
28+
Create a new C++ project by clicking`File > New > C++ Project`. You can name your project "PointmatcherEclipseDemo" and in toolchains select the default toolchain for your system (most likely Linux GCC). Click`Finish` to add your project to your Eclipse workspace.
2929

30-
You must then configure the project by going to`Project > Properties > C/C++Build > Settings`. Navigate to`C++ Compiler > Includes` and add the libpointmatcher (e.g.~/Libraries/libpointmatcher) and eigen (e.g. /usr/include/eigen3) include path to the`Include paths (-I)` list. Next, go to`C++ Linker/Libraries` and add the the following three dependencies to the "Libraries (-l)" list:
30+
You must then configure the project by going to`Project > Properties > C/C++Build > Settings`. Navigate to`C++ Compiler > Includes` and add the libpointmatcher (e.g.~/Libraries/libpointmatcher) and eigen (e.g. /usr/include/eigen3) include path to the`Include paths (-I)` list. Next, go to`C++ Linker/Libraries` and add the the following three dependencies to the "Libraries (-l)" list:
3131

3232
* pointmatcher
3333
* boost_system
3434
* nabo
3535

3636
Click`Ok` to save the configuration. Create a new source file by clicking`File > New > Source File` and name it "Demo.cpp". In this file you can type the following:
37-
37+
3838
```cpp
3939
#include<pointmatcher/PointMatcher.h>
4040
#include<iostream>
@@ -74,7 +74,6 @@ CONFIG += c++11
7474
#QMAKE_LFLAGS += -mmacosx-version-min=10.7
7575

7676
LIBS += /usr/local/lib/libboost_thread-mt.dylib\
77-
/usr/local/lib/libboost_filesystem-mt.dylib\
7877
/usr/local/lib/libboost_system-mt.dylib\
7978
/usr/local/lib/libboost_program_options-mt.dylib\
8079
/usr/local/lib/libboost_date_time-mt.dylib\
@@ -97,7 +96,7 @@ g++ -I/usr/local/include/pointmatcher -o myProgram.o -c myProgram.cpp
9796
You can then link to the pointmatcher library using:
9897

9998
```bash
100-
g++ myProgram.o -o myProgram -lpointmatcher -lnabo -lboost_system -lyaml-cpp -lboost_filesystem -lrt
99+
g++ myProgram.o -o myProgram -lpointmatcher -lnabo -lboost_system -lyaml-cpp -lrt
101100
```
102101

103102
Nevertheless, it is always more convenient to use a builder such as CMake.

‎evaluations/eval_solution.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4444

4545
#include<ncurses.h>
4646

47+
#include<filesystem>
4748
#include<boost/program_options.hpp>
48-
#include<boost/filesystem.hpp>
4949
#include<boost/date_time/posix_time/posix_time.hpp>
5050
#include<boost/date_time/posix_time/posix_time_io.hpp>
5151
#include<boost/thread/thread.hpp>
@@ -55,7 +55,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5555
usingnamespacestd;
5656
usingnamespacePointMatcherSupport;
5757
namespacepo= boost::program_options;
58-
namespacefs=boost::filesystem;
58+
namespacefs=std::filesystem;
5959
namespacept= boost::posix_time;
6060

6161
typedef PointMatcher<float> PM;

‎examples/align_sequence.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3838
#include<cassert>
3939
#include<iostream>
4040
#include<fstream>
41-
#include<boost/format.hpp>
42-
#include<boost/filesystem/path.hpp>
43-
#include<boost/filesystem/operations.hpp>
4441

4542

4643
usingnamespacestd;

‎examples/build_map.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3737
#include"pointmatcher/IO.h"
3838
#include<cassert>
3939
#include<iostream>
40-
#include<fstream>
41-
#include<boost/format.hpp>
42-
#include<boost/filesystem/path.hpp>
43-
#include<boost/filesystem/operations.hpp>
40+
#include<filesystem>
4441
#include<boost/lexical_cast.hpp>
4542

4643
usingnamespacestd;
@@ -210,7 +207,7 @@ int main(int argc, char *argv[])
210207
}
211208

212209
stringstream outputFileNameIter;
213-
outputFileNameIter <<boost::filesystem::path(outputFileName).stem().c_str() <<"_" << i <<".vtk";
210+
outputFileNameIter <<std::filesystem::path(outputFileName).stem().c_str() <<"_" << i <<".vtk";
214211

215212
mapCloud.save(outputFileNameIter.str());
216213
}

‎examples/compute_overlap.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3737
#include"pointmatcher/IO.h"
3838
#include<cassert>
3939
#include<iostream>
40-
#include<iomanip>
4140
#include<fstream>
42-
#include<boost/format.hpp>
43-
#include<boost/filesystem/path.hpp>
44-
#include<boost/filesystem/operations.hpp>
4541
#include<boost/lexical_cast.hpp>
4642

4743
usingnamespacestd;

‎examples/demo_Qt/demo.pro‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ CONFIG += c++11
1818
#QMAKE_LFLAGS += -mmacosx-version-min=10.7
1919

2020
LIBS +=/usr/local/lib/libboost_thread-mt.dylib\
21-
/usr/local/lib/libboost_filesystem-mt.dylib\
2221
/usr/local/lib/libboost_system-mt.dylib\
2322
/usr/local/lib/libboost_program_options-mt.dylib\
2423
/usr/local/lib/libboost_date_time-mt.dylib\

‎examples/demo_cmake/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ project(convert)
77
set(CMAKE_CXX_STANDARD 17)
88

99
find_package(libpointmatcher REQUIRED)
10-
find_package(Boost REQUIRED COMPONENTS filesystem)
10+
find_package(Boost REQUIRED)
1111

1212
include_directories(${CMAKE_CURRENT_BINARY_DIR}${libpointmatcher_INCLUDE_DIRS}${Boost_INCLUDE_DIR})
1313

‎examples/icp.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3636
#include"pointmatcher/PointMatcher.h"
3737
#include"pointmatcher/Bibliography.h"
3838

39-
#include"boost/filesystem.hpp"
40-
4139
#include<cassert>
4240
#include<fstream>
4341
#include<iostream>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp