Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
O
Oersted
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Pries, Jason
Oersted
Commits
38350d71
Commit
38350d71
authored
Jul 26, 2017
by
Pries, Jason
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace boost::filesystem with std::experimental::filesystem
This eliminates all Boost library dependencies
parent
07c274f3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
15 deletions
+11
-15
CMakeLists.txt
CMakeLists.txt
+1
-4
src/Mesh/src/Mesh.cpp
src/Mesh/src/Mesh.cpp
+2
-3
src/Physics/src/FiniteElementMesh.h
src/Physics/src/FiniteElementMesh.h
+4
-4
src/Sketch/src/Sketch.cpp
src/Sketch/src/Sketch.cpp
+2
-2
src/Sketch/src/Sketch.h
src/Sketch/src/Sketch.h
+1
-1
test/CMakeLists.txt
test/CMakeLists.txt
+1
-1
No files found.
CMakeLists.txt
View file @
38350d71
...
...
@@ -2,13 +2,10 @@ cmake_minimum_required(VERSION 3.2)
project
(
Oersted
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=gnu++1
4
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-std=gnu++1
7
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-g -O0 --coverage"
)
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
find_package
(
Boost REQUIRED COMPONENTS system filesystem
)
include_directories
(
${
Boost_INCLUDE_DIR
}
)
include_directories
(
./lib/
)
include_directories
(
./lib/Eigen/
)
include_directories
(
./lib/GoogleTest/googletest/include/gtest
)
...
...
src/Mesh/src/Mesh.cpp
View file @
38350d71
...
...
@@ -2,7 +2,6 @@
Mesh
::
Mesh
(
Sketch
&
sketch
)
{
Boundary
=
sketch
.
boundary
();
for
(
size_t
i
=
0
;
i
!=
sketch
.
size_curves
();
++
i
)
{
auto
c
=
sketch
.
curve
(
i
);
if
(
!
(
c
->
for_construction
()))
{
...
...
@@ -892,8 +891,8 @@ void Mesh::save_as(std::string path, std::string file_name) const {
This is a stub for visualization
*/
if
(
!
boost
::
filesystem
::
exists
(
path
))
{
boost
::
filesystem
::
create_directories
(
path
);
if
(
!
std
::
experimental
::
filesystem
::
exists
(
path
))
{
std
::
experimental
::
filesystem
::
create_directories
(
path
);
}
std
::
fstream
fs
;
...
...
src/Physics/src/FiniteElementMesh.h
View file @
38350d71
...
...
@@ -363,8 +363,8 @@ public:
}
void
write_scalar
(
Eigen
::
VectorXd
const
&
v
,
std
::
string
path
,
std
::
string
file_name
)
const
override
{
if
(
!
boost
::
filesystem
::
exists
(
path
))
{
boost
::
filesystem
::
create_directories
(
path
);
if
(
!
std
::
experimental
::
filesystem
::
exists
(
path
))
{
std
::
experimental
::
filesystem
::
create_directories
(
path
);
}
std
::
fstream
fs
;
...
...
@@ -403,8 +403,8 @@ public:
}
void
write_vector
(
Eigen
::
ArrayXd
const
&
Fx
,
Eigen
::
ArrayXd
const
&
Fy
,
std
::
string
path
,
std
::
string
file_name
)
const
override
{
if
(
!
boost
::
filesystem
::
exists
(
path
))
{
boost
::
filesystem
::
create_directories
(
path
);
if
(
!
std
::
experimental
::
filesystem
::
exists
(
path
))
{
std
::
experimental
::
filesystem
::
create_directories
(
path
);
}
std
::
fstream
fs
;
...
...
src/Sketch/src/Sketch.cpp
View file @
38350d71
...
...
@@ -183,8 +183,8 @@ void Sketch::save_as<SaveMethod::Rasterize>(std::string path, std::string file_n
This is a stub for visualization
*/
if
(
!
boost
::
filesystem
::
exists
(
path
))
{
boost
::
filesystem
::
create_directories
(
path
);
if
(
!
std
::
experimental
::
filesystem
::
exists
(
path
))
{
std
::
experimental
::
filesystem
::
create_directories
(
path
);
}
std
::
fstream
fs
;
...
...
src/Sketch/src/Sketch.h
View file @
38350d71
...
...
@@ -10,7 +10,7 @@
#include <vector>
#include <iostream>
#include <
boost/filesystem.hpp
>
#include <
experimental/filesystem
>
#include "Eigen"
...
...
test/CMakeLists.txt
View file @
38350d71
...
...
@@ -35,4 +35,4 @@ set(SOURCE_FILES
add_executable
(
run_tests
${
SOURCE_FILES
}
)
target_link_libraries
(
run_tests gtest gtest_main sketch mesh physics quadrature
)
\ No newline at end of file
target_link_libraries
(
run_tests gtest gtest_main sketch mesh physics quadrature stdc++fs
)
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment