diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-02-19 11:19:17 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-02-19 11:19:17 +0100 |
| commit | 818302c8538b5bad2130ff1e454d9e4054e87c91 (patch) | |
| tree | df01c18a414e46956c7b969312ffbd2dc7852407 | |
| parent | 437ba9ad651a395b8b3105f5a2d2848194166c06 (diff) | |
| parent | 2d2aa1ff6e52567d4710af22fdfa11ae54a08420 (diff) | |
| download | libgit2-818302c8538b5bad2130ff1e454d9e4054e87c91.tar.gz | |
Merge pull request #2820 from leoyanggit/mac_build
Fix Mac build without OpenSSL
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 69ce6fed8..81dc4c24a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,6 @@ OPTION( VALGRIND "Configure build for valgrind" OFF ) IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") SET( USE_ICONV ON ) - ADD_DEFINITIONS(-DGIT_COMMON_CRYPTO) ENDIF() IF(MSVC) @@ -173,6 +172,8 @@ ENDIF() IF (WIN32 AND NOT MINGW AND NOT SHA1_TYPE STREQUAL "builtin") ADD_DEFINITIONS(-DWIN32_SHA1) FILE(GLOB SRC_SHA1 src/hash/hash_win32.c) +ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + ADD_DEFINITIONS(-DGIT_COMMON_CRYPTO) ELSEIF (OPENSSL_FOUND AND NOT SHA1_TYPE STREQUAL "builtin") ADD_DEFINITIONS(-DOPENSSL_SHA1) IF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") |