Bump submodules.

zeek · Feb 23, 2024 · 8ddc6ef · 8ddc6ef
1 parent f4fdb90
commit 8ddc6ef
Show file tree

Hide file tree

Showing 22 changed files with 46,110 additions and 23,021 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -24,7 +24,7 @@
  url = https://github.com/mariusbancila/stduuid
 [submodule "3rdparty/pfs"]
  path = 3rdparty/pfs
- url = https://github.com/dtrugman/pfs
+ url = https://github.com/rsmmr/pfs.git
 [submodule "3rdparty/reproc"]
  path = 3rdparty/reproc
  url = https://github.com/DaanDeMeyer/reproc

diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -26,19 +26,24 @@ if ( WIN32 )
  endif()
 
 add_subdirectory(doctest EXCLUDE_FROM_ALL)
-add_subdirectory(filesystem EXCLUDE_FROM_ALL)
 add_subdirectory(fmt EXCLUDE_FROM_ALL)
 add_subdirectory(replxx EXCLUDE_FROM_ALL)
 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(GHC_FILESYSTEM_WITH_INSTALL "With install target" ON)
+add_subdirectory(filesystem 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)
 add_subdirectory(spdlog EXCLUDE_FROM_ALL)
+# just setting SPDLOG_FMT_EXTERNAL isn't sufficient for some reason
+target_compile_definitions(spdlog PUBLIC SPDLOG_FMT_EXTERNAL)
+target_link_libraries(spdlog PUBLIC fmt)
 
 # IXWebSocket will pick up on us having configured OpenSSL already.
 option(USE_TLS "Enable TLS support" ON)
@@ -88,7 +93,7 @@ set_property(TARGET reproc++ PROPERTY POSITION_INDEPENDENT_CODE ON)
 if ( HAVE_LINUX )
  set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "" FORCE)
  add_subdirectory(pfs EXCLUDE_FROM_ALL)
- target_include_directories(pfs PUBLIC pfs/include)
+ target_include_directories(pfs PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pfs/include>")
  target_compile_definitions(pfs PRIVATE preadv64=preadv) # work-around preadv64 not being defined on Alpine 3.19.
 endif()
 

diff --git a/3rdparty/IXWebSocket b/3rdparty/IXWebSocket
diff --git a/3rdparty/broker b/3rdparty/broker
diff --git a/3rdparty/doctest b/3rdparty/doctest
diff --git a/3rdparty/filesystem b/3rdparty/filesystem
diff --git a/3rdparty/fmt b/3rdparty/fmt
diff --git a/3rdparty/glob b/3rdparty/glob
diff --git a/3rdparty/json b/3rdparty/json
diff --git a/3rdparty/out_ptr b/3rdparty/out_ptr
diff --git a/3rdparty/pfs b/3rdparty/pfs
diff --git a/3rdparty/reproc b/3rdparty/reproc
diff --git a/3rdparty/spdlog b/3rdparty/spdlog