diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2016-01-13 19:57:54 +0300 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2016-01-13 19:57:54 +0300 |
| commit | 47cf739e97f3254e90d7399c86b38b0e086869a7 (patch) | |
| tree | 109b9b57e6288ac31c4fd87e8651d52fa6ae1aef | |
| parent | 700f0aff24d9b292f24d802c3af3b5c1705193c5 (diff) | |
| parent | 768e185c54164a66fc4e2dbe7c58097eff65ebdf (diff) | |
Merge pull request #3569 from arthurschreiber/arthur/fix-windows-issues
Fix some issues with generated pkg-config file
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | libgit2.pc.in | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 40a52bc01..0aa58625a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,7 +257,8 @@ IF (WIN32 AND WINHTTP) LINK_DIRECTORIES(${LIBWINHTTP_PATH}) ENDIF () - LINK_LIBRARIES(winhttp rpcrt4 crypt32) + LINK_LIBRARIES(winhttp rpcrt4 crypt32 ole32) + LIST(APPEND LIBGIT2_PC_LIBS "-lwinhttp" "-lrpcrt4" "-lcrypt32" "-lole32") ELSE () IF (CURL) PKG_CHECK_MODULES(CURL libcurl) diff --git a/libgit2.pc.in b/libgit2.pc.in index 880266a30..329a560a7 100644 --- a/libgit2.pc.in +++ b/libgit2.pc.in @@ -6,7 +6,7 @@ Name: libgit2 Description: The git library, take 2 Version: @LIBGIT2_VERSION_STRING@ -Libs: -L${libdir} -lgit2 +Libs: -L"${libdir}" -lgit2 Libs.private: @LIBGIT2_PC_LIBS@ Requires.private: @LIBGIT2_PC_REQUIRES@ |