Switch glob::glob to use ghc::filesystem.

Closes #52.
zeek · Oct 31, 2022 · bdb1df6 · bdb1df6
1 parent 06905ff
commit bdb1df6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -33,6 +33,8 @@ add_subdirectory(json EXCLUDE_FROM_ALL)
 add_subdirectory(stduuid EXCLUDE_FROM_ALL)
 add_subdirectory(tomlplusplus EXCLUDE_FROM_ALL)
 add_subdirectory(out_ptr EXCLUDE_FROM_ALL)
+
+option(GLOB_USE_GHC_FILESYSTEM "Use ghc::filesystem instead of std::filesystem" ON)
 add_subdirectory(glob EXCLUDE_FROM_ALL)
 
 set(SPDLOG_FMT_EXTERNAL ON)

diff --git a/src/util/helpers.cc b/src/util/helpers.cc
@@ -149,11 +149,7 @@ std::vector<filesystem::path> zeek::agent::glob(const filesystem::path& pattern,
     if ( paths.size() > max )
         paths.resize(max);
 
-    std::vector<filesystem::path> ret;
-    for ( const auto& path : paths )
-        ret.emplace_back(path.string());
-
-    return ret;
+    return paths;
 }
 
 TEST_SUITE("Helpers") {