Replace boost system and filesystem libraries with std17

hrobeers · Mar 20, 2020 · a495370 · a495370
1 parent 66a0edf
commit a495370
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -84,7 +84,7 @@ endif()
 set(CMAKE_AUTOMOC ON)
 
 # Boost
-find_package(Boost COMPONENTS system filesystem iostreams REQUIRED)
+find_package(Boost COMPONENTS iostreams REQUIRED)
 if(Boost_FOUND)
   message(STATUS "Including Boost from: ${Boost_INCLUDE_DIRS}")
   include_directories(${Boost_INCLUDE_DIRS})

diff --git a/src/foillogic/CMakeLists.txt b/src/foillogic/CMakeLists.txt
@@ -18,7 +18,6 @@ set_property(TARGET ${LIB_NAME} PROPERTY CXX_STANDARD 17)
 
 target_link_libraries(${LIB_NAME}
     finfoil_patheditor
-    ${Boost_LIBRARIES}
 )
 
 install(TARGETS ${LIB_NAME}

diff --git a/src/hrlib/CMakeLists.txt b/src/hrlib/CMakeLists.txt
@@ -9,7 +9,7 @@ file(GLOB_RECURSE SRC_C *.c *.h)
 add_library(${LIB_NAME} ${FINFOIL_LIB_TYPE} ${SRC} ${SRC_C} ${HDR})
 set_property(TARGET ${LIB_NAME} PROPERTY CXX_STANDARD 17)
 
-target_link_libraries(${LIB_NAME} Qt5::Core)
+target_link_libraries(${LIB_NAME} Qt5::Core ${Boost_LIBRARIES})
 
 install(TARGETS ${LIB_NAME}
   LIBRARY DESTINATION lib

diff --git a/src/version_autogen.hpp b/src/version_autogen.hpp
@@ -11,7 +11,7 @@
 #define MINOR_VERSION 2
 #define REVISION 0
 
-#define BUILD_NUMBER 606
-#define COMMIT_HASH "04334e8591f2752dbeb12cd45b45d503d9f5d363"
+#define BUILD_NUMBER 607
+#define COMMIT_HASH "66a0edf269c739c6cbd0c798c8c7b3aeb2524a9a"
 
 #endif // VERSION_AUTOGEN_H
diff --git a/tests/unittests/CMakeLists.txt b/tests/unittests/CMakeLists.txt
@@ -19,6 +19,7 @@ file(GLOB_RECURSE HDR *.hpp)
 #
 
 add_executable(${TESTS_BINARY_NAME} WIN32 ${SRC} ${HDR} ${MOC_SRC} ${FORMS_HEADERS} ${RC_SRC} ${QM})
+set_property(TARGET ${TESTS_BINARY_NAME} PROPERTY CXX_STANDARD 17)
 
 
 #
@@ -32,6 +33,4 @@ target_link_libraries(${TESTS_BINARY_NAME}
     finfoil_patheditor
     finfoil_logic
     jenson
-    ${Boost_FILESYSTEM_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
 )
diff --git a/tests/unittests/foillogic-tests/foiltests.cpp b/tests/unittests/foillogic-tests/foiltests.cpp
@@ -22,8 +22,10 @@
 
 #include "foiltests.hpp"
 
+#include <fstream>
+#include <filesystem>
+
 #include <boost/format.hpp>
-#include <boost/filesystem.hpp>
 
 #include "submodules/qtestrunner/qtestrunner.hpp"
 #include "foillogic/foil.hpp"
@@ -109,7 +111,7 @@ std::unique_ptr<QImage> toImage(Path *path)
 void FoilTests::testOutlineIO()
 {
   std::string path = "testdata/outlines/";
-  for (const boost::filesystem::directory_entry &p : boost::filesystem::directory_iterator(path))
+  for (const std::filesystem::directory_entry &p : std::filesystem::directory_iterator(path))
   {
     if (p.path().extension().string()!=".pdf")
       // TODO error handling on non-pdf files

diff --git a/tests/unittests/hrlib-tests/curvefittests.cpp b/tests/unittests/hrlib-tests/curvefittests.cpp
@@ -22,7 +22,8 @@
 
 #include "curvefittests.hpp"
 
-#include <boost/filesystem.hpp>
+#include <fstream>
+#include <filesystem>
 
 #include "submodules/qtestrunner/qtestrunner.hpp"
 #include "hrlib/curvefit/curvefit.hpp"
@@ -34,7 +35,7 @@ using namespace std;
 void CurveFitTests::testVertexReading()
 {
   std::string path = "testdata/profiles/";
-  for (auto & p : boost::filesystem::directory_iterator(path))
+  for (auto & p : std::filesystem::directory_iterator(path))
   {
     std::ifstream ifs;
     ifs.open(p.path().string(), std::ifstream::in);