Skip to content

G
git2
Commit 47cf739e by Carlos Martín Nieto
Options

Merge pull request #3569 from arthurschreiber/arthur/fix-windows-issues 

Fix some issues with generated pkg-config file
parents 700f0aff 768e185c
Showing with 3 additions and 2 deletions
CMakeLists.txt
...@@ -257,7 +257,8 @@ IF (WIN32 AND WINHTTP) ...@@ -257,7 +257,8 @@ IF (WIN32 AND WINHTTP)
LINK_DIRECTORIES(${LIBWINHTTP_PATH}) LINK_DIRECTORIES(${LIBWINHTTP_PATH})
ENDIF () ENDIF ()
LINK_LIBRARIES(winhttp rpcrt4 crypt32) LINK_LIBRARIES(winhttp rpcrt4 crypt32 ole32)
LIST(APPEND LIBGIT2_PC_LIBS "-lwinhttp" "-lrpcrt4" "-lcrypt32" "-lole32")
ELSE () ELSE ()
IF (CURL) IF (CURL)
PKG_CHECK_MODULES(CURL libcurl) PKG_CHECK_MODULES(CURL libcurl)
......
libgit2.pc.in
...@@ -6,7 +6,7 @@ Name: libgit2 ...@@ -6,7 +6,7 @@ Name: libgit2
Description: The git library, take 2 Description: The git library, take 2
Version: @LIBGIT2_VERSION_STRING@ Version: @LIBGIT2_VERSION_STRING@
Libs: -L${libdir} -lgit2 Libs: -L"${libdir}" -lgit2
Libs.private: @LIBGIT2_PC_LIBS@ Libs.private: @LIBGIT2_PC_LIBS@
Requires.private: @LIBGIT2_PC_REQUIRES@ Requires.private: @LIBGIT2_PC_REQUIRES@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment