Skip to content

Commit

Permalink
Add ghc::filesystem to cpm-mode
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidAce committed Jun 11, 2021
1 parent 1f7ea50 commit 97eb1d8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions cmake/SetupStdFilesystem.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ find_package(Filesystem COMPONENTS Final Experimental)
if (TARGET std::filesystem)
target_link_libraries(deps INTERFACE std::filesystem)
list(APPEND H5PP_TARGETS std::filesystem)
elseif(H5PP_PACKAGE_MANAGER MATCHES "cmake|fetch|conan")
elseif(H5PP_PACKAGE_MANAGER MATCHES "cmake|fetch|cpm|conan")
message(STATUS "Your compiler lacks std::filesystem. A drop-in replacement 'ghc::filesystem' will be downloaded")
message(STATUS "Read more about ghc::filesystem here: https://github.com/gulrak/filesystem")
include(cmake/InstallGHCFilesystem.cmake)
Expand All @@ -16,7 +16,7 @@ elseif(H5PP_PACKAGE_MANAGER MATCHES "cmake|fetch|conan")
message(FATAL_ERROR "<filesystem> header and/or library not found")
endif()
else()
message(STATUS "Your compiler lacks std::filesystem. Set H5PP_PACKAGE_MANAGER to 'cmake', 'fetch' or 'conan' to get the ghc::filesystem replacement")
message(STATUS "Your compiler lacks std::filesystem. Set H5PP_PACKAGE_MANAGER to 'cmake', 'fetch', 'cpm' or 'conan' to get the ghc::filesystem replacement")
message(STATUS "Read more about ghc::filesystem here: https://github.com/gulrak/filesystem")
message(FATAL_ERROR "<filesystem> header and/or library not found")
endif()
2 changes: 1 addition & 1 deletion cmake/h5ppConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ get_target_property(H5PP_ENABLED_TARGETS h5pp::deps INTERFACE_LINK_LIBRARIES)
if(H5PP_PACKAGE_MANAGER MATCHES "conan")
include(${CMAKE_CURRENT_LIST_DIR}/h5ppConfig.deps-conan.cmake)
endif()
if(H5PP_PACKAGE_MANAGER MATCHES "find|fetch|cmake")
if(H5PP_PACKAGE_MANAGER MATCHES "find|fetch|cpm|cmake")
include(${CMAKE_CURRENT_LIST_DIR}/h5ppConfig.deps-cmake.cmake)
endif()

Expand Down
2 changes: 1 addition & 1 deletion cmake/h5ppConfig.deps-cmake.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if(NOT TARGET std::filesystem)
else()
message(WARNING "<filesystem> header and/or library not found\n"
"Your compiler seems to lack std::filesystem\n"
"Set H5PP_PACKAGE_MANAGER to 'cmake', 'fetch' or 'conan' to get the ghc::filesystem replacement."
"Set H5PP_PACKAGE_MANAGER to 'cmake', 'fetch', 'cpm' or 'conan' to get the ghc::filesystem replacement."
"Read more about ghc::filesystem here: https://github.com/gulrak/filesystem\n")
endif()
endif()
Expand Down

0 comments on commit 97eb1d8

Please sign in to comment.