diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 75449ea94b..7a4029120c 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -281,14 +281,13 @@ if(WITH_GSPELL) endif() endif() -find_package(Boost 1.19.0 REQUIRED COMPONENTS filesystem) +find_package(Boost 1.19.0 REQUIRED) if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9) list(APPEND INKSCAPE_LIBS "-lstdc++fs") endif() list(APPEND INKSCAPE_INCS_SYS ${Boost_INCLUDE_DIRS}) -# list(APPEND INKSCAPE_LIBS ${Boost_LIBRARIES}) #find_package(OpenSSL) #list(APPEND INKSCAPE_INCS_SYS ${OPENSSL_INCLUDE_DIR}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 635c5afad3..8831204ccd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -413,8 +413,6 @@ if(WITH_INTERNAL_CAIRO) add_dependencies(inkscape_base cairo_ext) endif() -target_link_libraries(inkscape_base PUBLIC Boost::filesystem) - # Link the inkscape_base library against all external dependencies target_link_libraries(inkscape_base PRIVATE diff --git a/src/io/file-export-cmd.cpp b/src/io/file-export-cmd.cpp index d2c898d7e4..3617e35678 100644 --- a/src/io/file-export-cmd.cpp +++ b/src/io/file-export-cmd.cpp @@ -39,17 +39,8 @@ #include "extension/init.h" -// Temporary dependency : once all compilers we want to support have support for -// C++17 std::filesystem (with #include ) then we drop this dep -// (Dev meeting, 2020-09-25) - -#ifdef G_OS_WIN32 #include namespace filesystem = std::filesystem; -#else -#include -namespace filesystem = boost::filesystem; -#endif InkFileExportCmd::InkFileExportCmd() : export_overwrite(false) @@ -80,11 +71,7 @@ InkFileExportCmd::do_export(SPDocument* doc, std::string filename_in) // Get export type from filename supplied with --export-filename if (!export_filename.empty() && export_filename != "-") { -#ifdef G_OS_WIN32 auto fn = filesystem::u8path(export_filename); -#else - auto fn = filesystem::path(export_filename); -#endif if (!fn.has_extension()) { if (export_type.empty() && export_extension.empty()) { std::cerr << "InkFileExportCmd::do_export: No export type specified. " diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp index e082467e95..707648ed44 100644 --- a/src/ui/dialog/dialog-manager.cpp +++ b/src/ui/dialog/dialog-manager.cpp @@ -4,14 +4,8 @@ #include #include -#ifdef G_OS_WIN32 #include namespace filesystem = std::filesystem; -#else -// Waiting for compiler on MacOS to catch up to C++x17 -#include -namespace filesystem = boost::filesystem; -#endif #include "io/resource.h" #include "inkscape-application.h" @@ -246,11 +240,7 @@ void DialogManager::restore_dialogs_state(DialogContainer *docking_container, bo auto keyfile = std::make_unique(); std::string filename = Glib::build_filename(Inkscape::IO::Resource::profile_path(), dialogs_state); -#ifdef G_OS_WIN32 bool exists = filesystem::exists(filesystem::u8path(filename)); -#else - bool exists = filesystem::exists(filesystem::path(filename)); -#endif if (exists && keyfile->load_from_file(filename)) { // restore visible dialogs first; that state is up-to-date diff --git a/src/ui/widget/framecheck.cpp b/src/ui/widget/framecheck.cpp index 27b3d5bf36..b7b83193f4 100644 --- a/src/ui/widget/framecheck.cpp +++ b/src/ui/widget/framecheck.cpp @@ -1,9 +1,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include #include -#include // Using boost::filesystem instead of std::filesystem due to broken C++17 on MacOS. +#include #include "framecheck.h" -namespace fs = boost::filesystem; +namespace fs = std::filesystem; namespace Inkscape { namespace FrameCheck {