Skip to content

Commit a09aa10

Browse files
committed
Migrate fpattern
1 parent 7c8f694 commit a09aa10

File tree

3 files changed

+7
-28
lines changed

3 files changed

+7
-28
lines changed

CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,7 @@ else()
354354
endif()
355355

356356
add_subdirectory("third_party/fpattern")
357-
target_link_libraries(${EXECUTABLE_NAME} ${FPATTERN_LIBRARY})
358-
target_include_directories(${EXECUTABLE_NAME} PRIVATE ${FPATTERN_INCLUDE_DIR})
357+
target_link_libraries(${EXECUTABLE_NAME} fpattern::fpattern)
359358

360359
target_link_libraries(${EXECUTABLE_NAME} ${SDL2_LIBRARIES})
361360
target_include_directories(${EXECUTABLE_NAME} PRIVATE ${SDL2_INCLUDE_DIRS})

src/plib/db/db.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <dirent.h>
1212
#endif
1313

14-
#include <fpattern.h>
14+
#include <fpattern/fpattern.h>
1515

1616
#include "platform_compat.h"
1717
#include "plib/assoc/assoc.h"

third_party/fpattern/CMakeLists.txt

+5-25
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,10 @@
11
include(FetchContent)
22

33
FetchContent_Declare(fpattern
4-
GIT_REPOSITORY "https://github.com/Loadmaster/fpattern"
5-
GIT_TAG "v1.9"
4+
GIT_REPOSITORY "https://github.com/alexbatalov/fpattern"
5+
GIT_TAG 8523173ec252c3b796fcdfca0fcc6329642fbbe3 # v1.9
6+
GIT_SHALLOW TRUE
7+
GIT_PROGRESS TRUE
68
)
79

8-
FetchContent_GetProperties(fpattern)
9-
if (NOT fpattern_POPULATED)
10-
FetchContent_Populate(fpattern)
11-
endif()
12-
13-
if(MSVC)
14-
set(CMAKE_DEBUG_POSTFIX "d")
15-
endif()
16-
17-
add_library(fpattern STATIC
18-
"${fpattern_SOURCE_DIR}/debug.h"
19-
"${fpattern_SOURCE_DIR}/fpattern.c"
20-
"${fpattern_SOURCE_DIR}/fpattern.h"
21-
)
22-
23-
if(NOT WIN32)
24-
target_compile_definitions(fpattern PRIVATE
25-
"-Dunix"
26-
)
27-
endif()
28-
29-
set(FPATTERN_LIBRARY "fpattern" PARENT_SCOPE)
30-
set(FPATTERN_INCLUDE_DIR "${fpattern_SOURCE_DIR}" PARENT_SCOPE)
10+
FetchContent_MakeAvailable(fpattern)

0 commit comments

Comments
 (0)