replace boost::filesystem with std::filesystem (#161)

* replace boost::filesystem with std::filesystem

Signed-off-by: Anton Dukhovnikov <[email protected]>

* small fixes

Signed-off-by: Anton Dukhovnikov <[email protected]>

---------

Signed-off-by: Anton Dukhovnikov <[email protected]>

Author: antond-weta

.github/workflows/ci.yml

@@ -41,7 +41,6 @@ jobs:
     env:
       CXX: ${{matrix.cxx_compiler}}
       CC: ${{matrix.cc_compiler}}
-      CMAKE_CXX_STANDARD: ${{matrix.cxx_std}}
       OPENEXR_VERSION: ${{matrix.openexr_ver}}
 
     steps:
@@ -74,6 +73,7 @@ jobs:
           -B build
           -S . 
           -D RTA_CENTOS7_CERES_HACK=ON
+          -D CMAKE_CXX_STANDARD=${{matrix.cxx_std}}
 
       - name: Build
         run: |
@@ -128,7 +128,6 @@ jobs:
     env:
       CXX: ${{matrix.cxx_compiler}}
       CC: ${{matrix.cc_compiler}}
-      CMAKE_CXX_STANDARD: ${{matrix.cxx_std}}
 
     steps:
       - uses: actions/checkout@v4
@@ -152,6 +151,7 @@ jobs:
         run: >
           cmake -B build -S .
           -D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/install
+          -D CMAKE_CXX_STANDARD=${{matrix.cxx_std}}
 
       - name: Build
         run: |
@@ -168,6 +168,7 @@ jobs:
           -B build_config_test
           -S ./unittest/config_tests
           -D RAWTOACES_DIR=${{ github.workspace }}/install/lib/cmake/RAWTOACES
+          -D CMAKE_CXX_STANDARD=${{matrix.cxx_std}}
 
       - name: Build config_tests
         run: >
@@ -246,7 +247,7 @@ jobs:
           -B build
           -S ${{ github.workspace }}
           -D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/install
-          -D CXX_STANDARD=C++17
+          -D CMAKE_CXX_STANDARD=17
           -D CMAKE_TOOLCHAIN_FILE="${{ matrix.toolchain_file }}"
           -D ENABLE_SHARED="${{ matrix.build_shared_libs }}"
           
@@ -268,6 +269,7 @@ jobs:
           -S ${{ github.workspace }}/unittest/config_tests
           -D RAWTOACES_DIR=${{ github.workspace }}/install/lib/cmake/RAWTOACES
           -D CMAKE_TOOLCHAIN_FILE="${{ matrix.toolchain_file }}"
+          -D CMAKE_CXX_STANDARD=17
 
       - name: Build config_tests
         run: >

CMakeLists.txt

@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.11)
 project( RAWTOACES )
 
+if( NOT DEFINED CMAKE_CXX_STANDARD )
+  set(CMAKE_CXX_STANDARD 17)
+endif()
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 set( RAWTOACES_MAJOR_VERSION 1 )
 set( RAWTOACES_MINOR_VERSION 1 )
 set( RAWTOACES_PATCH_VERSION 0 )
@@ -18,8 +23,8 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 endif()
 
 if (NOT CONFIGURED_ONCE)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${warnings}")
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${warnings}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${warnings}")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${warnings}")
 endif()
 
 ## Make install directories overridable

README.md

@@ -64,7 +64,8 @@ $ sudo apt-get -f cmake
 $ build_scripts/install_aces_container.bash
 $ sudo apt-get -f install \
     libimath-dev \
-    libboost-dev libboost-filesystem-dev \
+    libboost-dev \
+    libboost-system-dev \
     libboost-test-dev \
     libraw-dev libceres-dev
 ```
@@ -93,7 +94,6 @@ $ vcpkg install \
     imath:x64-windows \
     boost-system:x64-windows \
     boost-foreach:x64-windows \
-    boost-filesystem:x64-windows \
     boost-test:x64-windows \
     boost-property-tree:x64-windows
 ```

build_scripts/install_deps_linux.bash

@@ -6,6 +6,7 @@ time sudo apt-get update
 
 time sudo apt-get -q -f install -y \
     libimath-dev \
-    libboost-dev libboost-filesystem-dev \
+    libboost-dev \
+    libboost-system-dev \
     libboost-test-dev \
     libraw-dev libceres-dev

build_scripts/install_deps_windows.bash

@@ -8,6 +8,5 @@ vcpkg install \
     imath:x64-windows \
     boost-system:x64-windows \
     boost-foreach:x64-windows \
-    boost-filesystem:x64-windows \
     boost-test:x64-windows \
     boost-property-tree:x64-windows

config/RAWTOACESConfig.cmake.in

@@ -13,6 +13,6 @@ find_dependency ( Eigen3 )
 find_dependency ( Ceres )
 find_dependency ( libraw )
 find_dependency ( Imath )
-find_dependency ( Boost COMPONENTS system filesystem )
+find_dependency ( Boost COMPONENTS system )
 
 check_required_components(rawtoaces)

configure.cmake

@@ -6,10 +6,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/CMake"
 find_package ( AcesContainer CONFIG REQUIRED )
 find_package ( Eigen3        CONFIG REQUIRED )
 find_package ( Imath         CONFIG REQUIRED )
-find_package ( Boost                REQUIRED
+find_package ( Boost         CONFIG REQUIRED
     COMPONENTS
         system
-        filesystem
         unit_test_framework
 )
 

include/rawtoaces/define.h

@@ -56,8 +56,9 @@
 
 #include <string>
 #include <algorithm>
-#include <boost/filesystem.hpp>
+#include <filesystem>
 #include <iostream>
+#include <vector>
 
 #ifndef WIN32
 #    include <sys/stat.h>
@@ -344,13 +345,18 @@ inline vector<string> openDir( string path = "." )
 {
     vector<string> paths;
 
-    if ( boost::filesystem::exists( path ) )
+    if ( std::filesystem::exists( path ) )
     {
-        for ( auto &i: boost::filesystem::directory_iterator( path ) )
+        if ( std::filesystem::is_directory( path ) )
         {
-            if ( i.status().type() !=
-                 boost::filesystem::file_type::directory_file )
-                paths.push_back( i.path().string() );
+            auto it = std::filesystem::directory_iterator( path );
+            for ( auto filename: it )
+            {
+                if ( !std::filesystem::is_directory( filename ) )
+                {
+                    paths.push_back( filename.path().string() );
+                }
+            }
         }
     }
 

src/rawtoaces_idt/CMakeLists.txt

@@ -19,7 +19,6 @@ target_link_libraries(
     PUBLIC
         Boost::boost
         Boost::system
-        Boost::filesystem
         Imath::Imath
         Imath::ImathConfig
         Eigen3::Eigen

src/rawtoaces_util/acesrender.cpp

@@ -11,6 +11,8 @@
 
 #include <aces/aces_Writer.h>
 
+#include <mutex>
+
 #ifndef WIN32
 #    include <fcntl.h>
 #    include <sys/mman.h>
@@ -19,8 +21,6 @@
 using namespace std;
 using namespace boost::property_tree;
 
-#include <boost/filesystem.hpp>
-
 //  =====================================================================
 //  Prepare the matching between string flags and single character flag
 //
@@ -954,7 +954,7 @@ vector<string> findFiles( string filePath, vector<string> searchPaths )
     {
         string path = i + "/" + filePath;
 
-        if ( boost::filesystem::exists( path ) )
+        if ( std::filesystem::exists( path ) )
             foundFiles.push_back( path );
     }