Migrate fpattern

CMakeLists.txt

@@ -354,8 +354,7 @@ else()
 endif()
 
 add_subdirectory("third_party/fpattern")
-target_link_libraries(${EXECUTABLE_NAME} ${FPATTERN_LIBRARY})
-target_include_directories(${EXECUTABLE_NAME} PRIVATE ${FPATTERN_INCLUDE_DIR})
+target_link_libraries(${EXECUTABLE_NAME} fpattern::fpattern)
 
 target_link_libraries(${EXECUTABLE_NAME} ${SDL2_LIBRARIES})
 target_include_directories(${EXECUTABLE_NAME} PRIVATE ${SDL2_INCLUDE_DIRS})

src/plib/db/db.cc

@@ -11,7 +11,7 @@
 #include <dirent.h>
 #endif
 
-#include <fpattern.h>
+#include <fpattern/fpattern.h>
 
 #include "platform_compat.h"
 #include "plib/assoc/assoc.h"

third_party/fpattern/CMakeLists.txt

@@ -1,30 +1,10 @@
 include(FetchContent)
 
 FetchContent_Declare(fpattern
-    GIT_REPOSITORY "https://github.com/Loadmaster/fpattern"
-    GIT_TAG "v1.9"
+    GIT_REPOSITORY "https://github.com/alexbatalov/fpattern"
+    GIT_TAG 8523173ec252c3b796fcdfca0fcc6329642fbbe3 # v1.9
+    GIT_SHALLOW TRUE
+    GIT_PROGRESS TRUE
 )
 
-FetchContent_GetProperties(fpattern)
-if (NOT fpattern_POPULATED)
-    FetchContent_Populate(fpattern)
-endif()
-
-if(MSVC)
-    set(CMAKE_DEBUG_POSTFIX "d")
-endif()
-
-add_library(fpattern STATIC
-    "${fpattern_SOURCE_DIR}/debug.h"
-    "${fpattern_SOURCE_DIR}/fpattern.c"
-    "${fpattern_SOURCE_DIR}/fpattern.h"
-)
-
-if(NOT WIN32)
-    target_compile_definitions(fpattern PRIVATE
-        "-Dunix"
-    )
-endif()
-
-set(FPATTERN_LIBRARY "fpattern" PARENT_SCOPE)
-set(FPATTERN_INCLUDE_DIR "${fpattern_SOURCE_DIR}" PARENT_SCOPE)
+FetchContent_MakeAvailable(fpattern)