diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2018-01-08 12:30:50 +0000 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2018-01-08 12:30:50 +0000 |
| commit | b85548edb027474af3d107f9faa004cc09a1863a (patch) | |
| tree | a269b971178511a2f1d71f35f78693e9940bc6b0 | |
| parent | ddd36510b589f8dd39a9bfaaecfb9160dc943f42 (diff) | |
| download | libgit2-b85548edb027474af3d107f9faa004cc09a1863a.tar.gz | |
cmake: treat LIBGIT2_PC_REQUIRES as a list
It is indeed a list of dependencies for those which include the static archive.
This is in preparation for adding two possible places where we might add openssl
as a dependency.
| -rw-r--r-- | src/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c8389c2b8..6bcb0a1c9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -210,7 +210,7 @@ IF(SHA1_BACKEND STREQUAL "OpenSSL") IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") LIST(APPEND LIBGIT2_PC_LIBS "-lssl") ELSE() - SET(LIBGIT2_PC_REQUIRES "${LIBGIT2_PC_REQUIRES} openssl") + LIST(APPEND LIBGIT2_PC_REQUIRES "openssl") ENDIF() ELSEIF(SHA1_BACKEND STREQUAL "CollisionDetection") ADD_FEATURE_INFO(SHA ON "using CollisionDetection") @@ -265,7 +265,7 @@ IF(NOT USE_BUNDLED_ZLIB) LIST(APPEND LIBGIT2_LIBS "z") LIST(APPEND LIBGIT2_PC_LIBS "-lz") ELSE() - SET(LIBGIT2_PC_REQUIRES "${LIBGIT2_PC_REQUIRES} zlib") + LIST(APPEND LIBGIT2_PC_REQUIRES "zlib") ENDIF() ADD_FEATURE_INFO(zlib ON "using system zlib") ELSE() @@ -439,6 +439,9 @@ IF (SONAME) SET_TARGET_PROPERTIES(git2 PROPERTIES PREFIX "${LIBGIT2_PREFIX}") ENDIF() ENDIF() + +LIST(REMOVE_DUPLICATES LIBGIT2_PC_REQUIRES) +STRING(REPLACE ";" " " LIBGIT2_PC_REQUIRES "${LIBGIT2_PC_REQUIRES}") STRING(REPLACE ";" " " LIBGIT2_PC_LIBS "${LIBGIT2_PC_LIBS}") CONFIGURE_FILE(${libgit2_SOURCE_DIR}/libgit2.pc.in ${libgit2_BINARY_DIR}/libgit2.pc @ONLY) |