8000 Merge pull request #4282 from pks-t/pks/remove-unused-clar-fixtures · libgit2/libgit2@0a93ded · GitHub
[go: up one dir, main page]
Skip to content

Commit 0a93ded

Browse files
ethomsonethomson
authored
Merge pull request #4282 from pks-t/pks/remove-unused-clar-fixtures
Split up CMakeLists.txt build instructions
2 parents 1560b58 + a3a3547 commit 0a93ded

File tree

13 files changed

+561
-461
lines changed

13 files changed

+561
-461
lines changed

‎CMakeLists.txt

Lines changed: 15 additions & 459 deletions
Large diffs are not rendered by default.

‎deps/http-parser/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FILE(GLOB SRC_HTTP "*.c" "*.h")
2+
3+
ADD_LIBRARY(http-parser STATIC ${SRC_HTTP})

‎deps/regex/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
INCLUDE_DIRECTORIES(".")
2+
ADD_LIBRARY(regex STATIC "regex.c" "regex.h")

‎deps/winhttp/CMakeLists.txt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
FIND_PROGRAM(DLLTOOL dlltool CMAKE_FIND_ROOT_PATH_BOTH)
2+
IF (NOT DLLTOOL)
3+
MESSAGE(FATAL_ERROR "Could not find dlltool command")
4+
ENDIF ()
5+
6+
SET(LIBWINHTTP_PATH "${CMAKE_BINARY_DIR}/deps/winhttp")
7+
SET(LIBWINHTTP_PATH ${LIBWINHTTP_PATH} PARENT_SCOPE)
8+
FILE(MAKE_DIRECTORY ${LIBWINHTTP_PATH})
9+
10+
IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
11+
set(WINHTTP_DEF "winhttp64.def")
12+
ELSE()
13+
set(WINHTTP_DEF "winhttp.def")
14+
ENDIF()
15+
16+
ADD_CUSTOM_COMMAND(
17+
OUTPUT ${LIBWINHTTP_PATH}/libwinhttp.a
18+
COMMAND ${DLLTOOL} -d ${WINHTTP_DEF} -k -D winhttp.dll -l libwinhttp.a
19+
DEPENDS ${WINHTTP_DEF}
20+
WORKING_DIRECTORY ${LIBWINHTTP_PATH}
21+
)
22+
23+
SET_SOURCE_FILES_PROPERTIES(
24+
${CMAKE_CURRENT_SOURCE_DIR}/src/transports/winhttp.c
25+
PROPERTIES OBJECT_DEPENDS ${LIBWINHTTP_PATH}/libwinhttp.a
26+
)

‎deps/zlib/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ADD_DEFINITIONS(-DNO_VIZ -DSTDC -DNO_GZIP)
2+
FILE(GLOB SRC_ZLIB "*.c" "*.h")
3+
INCLUDE_DIRECTORIES(".")
4+
ADD_LIBRARY(zlib STATIC ${SRC_ZLIB})

‎examples/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
LINK_DIRECTORIES(${LIBGIT2_LIBDIRS})
2+
INCLUDE_DIRECTORIES(${LIBGIT2_INCLUDES})
3+
14
FILE(GLOB_RECURSE SRC_EXAMPLE_GIT2 network/*.c network/*.h)
25
ADD_EXECUTABLE(cgit2 ${SRC_EXAMPLE_GIT2})
36
IF(WIN32 OR ANDROID)

0 commit comments

Comments
 (0)
0