diff options
| author | Etienne Samson <samson.etienne@gmail.com> | 2017-09-06 22:01:50 +0000 |
|---|---|---|
| committer | Etienne Samson <samson.etienne@gmail.com> | 2017-10-23 20:02:35 +0200 |
| commit | 99d6ebb33375369f8a033938fab984f89832ba82 (patch) | |
| tree | c0c061b1425a24f8e4a86f361c62fdceb327ef23 /src | |
| parent | 152f3766eed6ad26e62eb614de22c9f5a50110b5 (diff) | |
| download | libgit2-99d6ebb33375369f8a033938fab984f89832ba82.tar.gz | |
cmake: make our macOS helpers more CMake-y
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bb5031366..9ea246405 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -95,23 +95,17 @@ IF(THREADSAFE) ENDIF() IF (SECURITY_FOUND) - # OS X 10.7 and older do not have some functions we use, fall back to OpenSSL there - CHECK_LIBRARY_EXISTS("${SECURITY_DIRS}" SSLCreateContext "Security/SecureTransport.h" HAVE_NEWER_SECURITY) - IF (HAVE_NEWER_SECURITY) - MESSAGE("-- Found Security ${SECURITY_DIRS}") - LIST(APPEND LIBGIT2_PC_LIBS "-framework Security") - LIST(APPEND LIBGIT2_LIBS ${SECURITY_DIRS}) - ELSE() - MESSAGE("-- Security framework is too old, falling back to OpenSSL") - SET(SECURITY_FOUND "NO") - SET(USE_OPENSSL "ON") - ENDIF() + IF (SECURITY_HAS_SSLCREATECONTEXT) + LIST(APPEND LIBGIT2_PC_LIBS ${SECURITY_LDFLAGS}) + ELSE() + MESSAGE("-- Security framework is too old, falling back to OpenSSL") + SET(USE_OPENSSL "ON") + ENDIF() ENDIF() IF (COREFOUNDATION_FOUND) - MESSAGE("-- Found CoreFoundation ${COREFOUNDATION_DIRS}") - LIST(APPEND LIBGIT2_PC_LIBS "-framework CoreFoundation") - LIST(APPEND LIBGIT2_LIBS ${COREFOUNDATION_DIRS}) + LIST(APPEND LIBGIT2_LIBS ${COREFOUNDATION_LIBRARIES}) + LIST(APPEND LIBGIT2_PC_LIBS ${COREFOUNDATION_LDFLAGS}) ENDIF() |