File tree 3 files changed +7
-28
lines changed
3 files changed +7
-28
lines changed Original file line number Diff line number Diff line change @@ -354,8 +354,7 @@ else()
354
354
endif ()
355
355
356
356
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)
359
358
360
359
target_link_libraries (${EXECUTABLE_NAME} ${SDL2_LIBRARIES} )
361
360
target_include_directories (${EXECUTABLE_NAME} PRIVATE ${SDL2_INCLUDE_DIRS} )
Original file line number Diff line number Diff line change 11
11
#include < dirent.h>
12
12
#endif
13
13
14
- #include < fpattern.h>
14
+ #include < fpattern/fpattern .h>
15
15
16
16
#include " platform_compat.h"
17
17
#include " plib/assoc/assoc.h"
Original file line number Diff line number Diff line change 1
1
include (FetchContent)
2
2
3
3
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
6
8
)
7
9
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)
You can’t perform that action at this time.
0 commit comments