Skip to content
Snippets Groups Projects
Verified Commit 9c71949c authored by Liam Keegan's avatar Liam Keegan
Browse files

add ghc::filesystem as a submodule instead of including header directly in repo

parent aa186676
No related branches found
No related tags found
1 merge request!25Resolve "Add simple adaptive timestepping"
Pipeline #29390 failed
[submodule "dune/copasi/common/ghc"]
path = ext/ghc
url = https://github.com/gulrak/filesystem
......@@ -24,6 +24,10 @@ dune_project()
dune_enable_all_packages()
set(USE_FALLBACK_FILESYSTEM no CACHE BOOL "Use bundled std::filesystem alternative (enable this for macOS older than 10.15)")
if(USE_FALLBACK_FILESYSTEM)
add_subdirectory(ext/ghc)
endif()
add_subdirectory(src)
add_subdirectory(dune)
add_subdirectory(lib)
......
......@@ -3,7 +3,6 @@ install(FILES bit_flags.hh
enum.hh
factory.hh
filesystem.hh
ghc/filesystem.hpp
muparser_data_handler.hh
pdelab_expression_adapter.hh
stepper.hh
......
......@@ -3,7 +3,7 @@
#ifdef DUNE_COPASI_USE_FALLBACK_FILESYSTEM
#include <dune/copasi/common/ghc/filesystem.hpp>
#include <ghc/filesystem.hpp>
namespace fs {
using namespace ghc::filesystem;
}
......
This diff is collapsed.
Subproject commit d8abf146a43ea12d28b09dfa71ece3bad4168185
......@@ -8,9 +8,9 @@ target_include_directories(dune_copasi_lib INTERFACE
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
set(USE_FALLBACK_FILESYSTEM no CACHE BOOL "Use bundled std::filesystem alternative (enable this for macOS older than 10.15)")
if(USE_FALLBACK_FILESYSTEM)
target_compile_definitions(dune_copasi_lib PUBLIC DUNE_COPASI_USE_FALLBACK_FILESYSTEM)
target_link_libraries(dune_copasi_lib PUBLIC ghc_filesystem)
elseif(Filesystem_FOUND)
target_link_libraries(dune_copasi_lib PUBLIC std::filesystem)
endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment