diff options
| author | Patrick Steinhardt <ps@pks.im> | 2017-06-28 13:21:09 +0200 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2017-08-16 07:12:38 +0200 |
| commit | 432485001593d25c6900acbd17f089e056ce91d2 (patch) | |
| tree | a3cbee66cb38017b8f968a2ffc8bf9cd987a7b72 | |
| parent | bed7ca3a3d73b06c2f97d10376607c022550aef3 (diff) | |
| download | libgit2-432485001593d25c6900acbd17f089e056ce91d2.tar.gz | |
cmake: move winhttp build instructions into subdirectory
Extract code required to build the winhttp library into its own
CMakeLists.txt, which is included as required.
| -rw-r--r-- | CMakeLists.txt | 35 | ||||
| -rw-r--r-- | deps/winhttp/CMakeLists.txt | 26 |
2 files changed, 33 insertions, 28 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d56069afb..ab6077eea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -398,38 +398,17 @@ IF (WIN32 AND WINHTTP) # Since MinGW does not come with headers or an import library for winhttp, # we have to include a private header and generate our own import library IF (MINGW) - FIND_PROGRAM(DLLTOOL dlltool CMAKE_FIND_ROOT_PATH_BOTH) - IF (NOT DLLTOOL) - MESSAGE(FATAL_ERROR "Could not find dlltool command") - ENDIF () - - SET(LIBWINHTTP_PATH "${CMAKE_BINARY_DIR}/deps/winhttp") - FILE(MAKE_DIRECTORY ${LIBWINHTTP_PATH}) - - IF (CMAKE_SIZEOF_VOID_P EQUAL 8) - set(WINHTTP_DEF "${CMAKE_SOURCE_DIR}/deps/winhttp/winhttp64.def") - ELSE() - set(WINHTTP_DEF "${CMAKE_SOURCE_DIR}/deps/winhttp/winhttp.def") - ENDIF() - - ADD_CUSTOM_COMMAND( - OUTPUT ${LIBWINHTTP_PATH}/libwinhttp.a - COMMAND ${DLLTOOL} -d ${WINHTTP_DEF} -k -D winhttp.dll -l libwinhttp.a - DEPENDS ${WINHTTP_DEF} - WORKING_DIRECTORY ${LIBWINHTTP_PATH} - ) - - SET_SOURCE_FILES_PROPERTIES( - ${CMAKE_CURRENT_SOURCE_DIR}/src/transports/winhttp.c - PROPERTIES OBJECT_DEPENDS ${LIBWINHTTP_PATH}/libwinhttp.a - ) - + ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/deps/winhttp" "${CMAKE_BINARY_DIR}/deps/winhttp") + LIST(APPEND LIBGIT2_LIBS winhttp) LIST(APPEND LIBGIT2_INCLUDES "${CMAKE_SOURCE_DIR}/deps/winhttp") LIST(APPEND LIBGIT2_LIBDIRS ${LIBWINHTTP_PATH}) + ELSE() + LIST(APPEND LIBGIT2_LIBS "winhttp") + LIST(APPEND LIBGIT2_PC_LIBS "-lwinhttp") ENDIF () - LIST(APPEND LIBGIT2_LIBS "winhttp" "rpcrt4" "crypt32" "ole32") - LIST(APPEND LIBGIT2_PC_LIBS "-lwinhttp" "-lrpcrt4" "-lcrypt32" "-lole32") + LIST(APPEND LIBGIT2_LIBS "rpcrt4" "crypt32" "ole32") + LIST(APPEND LIBGIT2_PC_LIBS "-lrpcrt4" "-lcrypt32" "-lole32") ELSE () IF (CURL) PKG_CHECK_MODULES(CURL libcurl) diff --git a/deps/winhttp/CMakeLists.txt b/deps/winhttp/CMakeLists.txt new file mode 100644 index 000000000..baa9fe2f0 --- /dev/null +++ b/deps/winhttp/CMakeLists.txt @@ -0,0 +1,26 @@ +FIND_PROGRAM(DLLTOOL dlltool CMAKE_FIND_ROOT_PATH_BOTH) +IF (NOT DLLTOOL) + MESSAGE(FATAL_ERROR "Could not find dlltool command") +ENDIF () + +SET(LIBWINHTTP_PATH "${CMAKE_BINARY_DIR}/deps/winhttp") +SET(LIBWINHTTP_PATH ${LIBWINHTTP_PATH} PARENT_SCOPE) +FILE(MAKE_DIRECTORY ${LIBWINHTTP_PATH}) + +IF (CMAKE_SIZEOF_VOID_P EQUAL 8) + set(WINHTTP_DEF "winhttp64.def") +ELSE() + set(WINHTTP_DEF "winhttp.def") +ENDIF() + +ADD_CUSTOM_COMMAND( + OUTPUT ${LIBWINHTTP_PATH}/libwinhttp.a + COMMAND ${DLLTOOL} -d ${WINHTTP_DEF} -k -D winhttp.dll -l libwinhttp.a + DEPENDS ${WINHTTP_DEF} + WORKING_DIRECTORY ${LIBWINHTTP_PATH} +) + +SET_SOURCE_FILES_PROPERTIES( + ${CMAKE_CURRENT_SOURCE_DIR}/src/transports/winhttp.c + PROPERTIES OBJECT_DEPENDS ${LIBWINHTTP_PATH}/libwinhttp.a +) |