diff options
| author | Patrick Steinhardt <ps@pks.im> | 2016-09-05 13:24:07 +0200 |
|---|---|---|
| committer | Carlos MartÃn Nieto <cmn@dwim.me> | 2016-10-01 17:41:28 +0200 |
| commit | edf420f37b1be635b72717f53d81d0973613e5b3 (patch) | |
| tree | b1ce46f5bf8201b6b4d9e60ad649f0cdc3e42344 | |
| parent | e499b13cb0dc0c47a1ed31ed568f3a226c4bc42f (diff) | |
| download | libgit2-edf420f37b1be635b72717f53d81d0973613e5b3.tar.gz | |
cmake: add curl library path
The `PKG_CHECK_MODULES` function searches a pkg-config module and
then proceeds to set various variables containing information on
how to link to the library. In contrast to the `FIND_PACKAGE`
function, the library path set by `PKG_CHECK_MODULES` will not
necessarily contain linking instructions with a complete path to
the library, though. So when a library is not installed in a
standard location, the linker might later fail due to being
unable to locate it.
While we already honor this when configuring libssh2 by adding
`LIBSSH2_LIBRARY_DIRS` to the link directories, we fail to do so
for libcurl, preventing us to build libgit2 on e.g. FreeBSD. Fix
the issue by adding the curl library directory to the linker
search path.
| -rw-r--r-- | CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7baf68b5d..0f9cff575 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -286,6 +286,7 @@ ELSE () IF (CURL_FOUND) ADD_DEFINITIONS(-DGIT_CURL) INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) + LINK_DIRECTORIES(${CURL_LIBRARY_DIRS}) LINK_LIBRARIES(${CURL_LIBRARIES}) LIST(APPEND LIBGIT2_PC_LIBS ${CURL_LDFLAGS}) ENDIF() |