sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing issues with USE_BOOST_FILESYSTEM definition

Browse source
This commit is contained in:
Hummeltech 2023-03-19 13:39:20 -07:00 committed by GitHub
parent 93e488a6cf
commit bb280a2815
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -49,7 +49,7 @@ mapnik_option(USE_PROJ "adds proj support" ON)
mapnik_option(USE_GRID_RENDERER "adds grid renderer" ON) mapnik_option(USE_GRID_RENDERER "adds grid renderer" ON)
mapnik_option(USE_SVG_RENDERER "adds svg renderer" ON) mapnik_option(USE_SVG_RENDERER "adds svg renderer" ON)
mapnik_option(USE_BIGINT "uses 64 bit instead of 32" ON) mapnik_option(USE_BIGINT "uses 64 bit instead of 32" ON)
mapnik_option(USE_BOOST_FILESYSTEM "use boost::filesytem even if `std::filesystem` is avaible (since c++17)" OFF) mapnik_option(USE_BOOST_FILESYSTEM "use boost::filesytem even if `std::filesystem` is available (since c++17)" OFF)
mapnik_option(USE_MEMORY_MAPPED_FILE "uses file cache" ON) mapnik_option(USE_MEMORY_MAPPED_FILE "uses file cache" ON)
mapnik_option(USE_MULTITHREADED "enables the multithreaded features (threadsafe)" ON) mapnik_option(USE_MULTITHREADED "enables the multithreaded features (threadsafe)" ON)
mapnik_option(USE_NO_ATEXIT "disable atexit" OFF) mapnik_option(USE_NO_ATEXIT "disable atexit" OFF)
@ -156,11 +156,11 @@ mapnik_find_threads()
mapnik_find_package(ICU REQUIRED COMPONENTS uc i18n data) mapnik_find_package(ICU REQUIRED COMPONENTS uc i18n data)
mapnik_find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS regex) mapnik_find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS regex)
if(CMAKE_CXX_STANDARD LESS 17) if(CMAKE_CXX_STANDARD VERSION_LESS 17)
set(USE_BOOST_FILESYSTEM ON) set(USE_BOOST_FILESYSTEM ON CACHE BOOL "Use boost::filesystem" FORCE)
endif() endif()
if(USE_BOOST_FILESYSTEM) if(USE_BOOST_FILESYSTEM)
mapnik_find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS filesystem system) mapnik_find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS filesystem system)
endif() endif()
list(APPEND MAPNIK_COMPILE_DEFS BOOST_REGEX_HAS_ICU) list(APPEND MAPNIK_COMPILE_DEFS BOOST_REGEX_HAS_ICU)

14
include/mapnik/filesystem.hpp
View file

@ -23,20 +23,20 @@
#ifndef MAPNIK_FILESYSTEM_HPP #ifndef MAPNIK_FILESYSTEM_HPP
#define MAPNIK_FILESYSTEM_HPP #define MAPNIK_FILESYSTEM_HPP
#if !defined(USE_BOOST_FILESYSTEM) #ifdef USE_BOOST_FILESYSTEM
#include <filesystem>
#else
#include <boost/filesystem/operations.hpp> // for absolute, exists, etc #include <boost/filesystem/operations.hpp> // for absolute, exists, etc
#include <boost/filesystem/path.hpp> // for path, operator/ #include <boost/filesystem/path.hpp> // for path, operator/
#else
#include <filesystem>
#endif #endif
namespace mapnik { namespace mapnik {
#if !defined(USE_BOOST_FILESYSTEM) #ifdef USE_BOOST_FILESYSTEM
namespace fs = std::filesystem;
using error_code = std::error_code;
#else
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
using error_code = boost::system::error_code; using error_code = boost::system::error_code;
#else
namespace fs = std::filesystem;
using error_code = std::error_code;
#endif #endif
} // namespace mapnik } // namespace mapnik