diff options
| author | Carlos Martín Nieto <carlos@cmartin.tk> | 2012-02-17 19:41:14 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <carlos@cmartin.tk> | 2012-02-17 22:00:17 +0100 |
| commit | c17b1d0052c8ab8ddc4735bf72e53e13e66bf41d (patch) | |
| tree | 755877c42cb08f1b455c87e730f858aaad042155 /CMakeLists.txt | |
| parent | d9da4ccaa05628bf0b52bac8780d209eb96f7635 (diff) | |
| download | libgit2-c17b1d0052c8ab8ddc4735bf72e53e13e66bf41d.tar.gz | |
Add POSIX regex sources when needed
Windows doesn't support POSIX regex, so we need to include it
ourselves. The sources come from git, which in turn took them from
gawk.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a09605a7..9b9ba0e8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,11 @@ FILE(GLOB SRC_HTTP deps/http-parser/*.c) IF (NOT WIN32) FIND_PACKAGE(ZLIB) +ELSE() + # Windows doesn't understand POSIX regex on its own + INCLUDE_DIRECTORIES(deps/regex) + SET(SRC_REGEX deps/regex/regex.c) + ADD_DEFINITIONS(-DGAWK -DNO_MBSUPPORT) ENDIF() IF (ZLIB_FOUND) @@ -99,7 +104,7 @@ ELSE() ENDIF () # Compile and link libgit2 -ADD_LIBRARY(git2 ${SRC} ${SRC_ZLIB} ${SRC_HTTP} ${WIN_RC}) +ADD_LIBRARY(git2 ${SRC} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX} ${WIN_RC}) IF (WIN32) TARGET_LINK_LIBRARIES(git2 ws2_32) @@ -130,7 +135,7 @@ IF (BUILD_TESTS) INCLUDE_DIRECTORIES(tests) FILE(GLOB SRC_TEST tests/t??-*.c) - ADD_EXECUTABLE(libgit2_test tests/test_main.c tests/test_lib.c tests/test_helpers.c ${SRC} ${SRC_TEST} ${SRC_ZLIB} ${SRC_HTTP}) + ADD_EXECUTABLE(libgit2_test tests/test_main.c tests/test_lib.c tests/test_helpers.c ${SRC} ${SRC_TEST} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX}) TARGET_LINK_LIBRARIES(libgit2_test ${CMAKE_THREAD_LIBS_INIT}) IF (WIN32) TARGET_LINK_LIBRARIES(libgit2_test ws2_32) @@ -158,7 +163,7 @@ IF (BUILD_CLAR) DEPENDS ${CLAR_PATH}/clar ${SRC_TEST} WORKING_DIRECTORY ${CLAR_PATH} ) - ADD_EXECUTABLE(libgit2_clar ${SRC} ${CLAR_PATH}/clar_main.c ${SRC_TEST} ${SRC_ZLIB} ${SRC_HTTP}) + ADD_EXECUTABLE(libgit2_clar ${SRC} ${CLAR_PATH}/clar_main.c ${SRC_TEST} ${SRC_ZLIB} ${SRC_HTTP} ${SRC_REGEX}) TARGET_LINK_LIBRARIES(libgit2_clar ${CMAKE_THREAD_LIBS_INIT}) IF (WIN32) TARGET_LINK_LIBRARIES(libgit2_clar ws2_32) |