Skip to content

G
git2
Commit 818302c8 by Carlos Martín Nieto
Options

Merge pull request #2820 from leoyanggit/mac_build 

Fix Mac build without OpenSSL
parents 437ba9ad 2d2aa1ff
Showing with 2 additions and 1 deletions
CMakeLists.txt
...@@ -43,7 +43,6 @@ OPTION( VALGRIND "Configure build for valgrind" OFF ) ...@@ -43,7 +43,6 @@ OPTION( VALGRIND "Configure build for valgrind" OFF )
IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
SET( USE_ICONV ON ) SET( USE_ICONV ON )
ADD_DEFINITIONS(-DGIT_COMMON_CRYPTO)
ENDIF() ENDIF()
IF(MSVC) IF(MSVC)
...@@ -173,6 +172,8 @@ ENDIF() ...@@ -173,6 +172,8 @@ ENDIF()
IF (WIN32 AND NOT MINGW AND NOT SHA1_TYPE STREQUAL "builtin") IF (WIN32 AND NOT MINGW AND NOT SHA1_TYPE STREQUAL "builtin")
ADD_DEFINITIONS(-DWIN32_SHA1) ADD_DEFINITIONS(-DWIN32_SHA1)
FILE(GLOB SRC_SHA1 src/hash/hash_win32.c) 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") ELSEIF (OPENSSL_FOUND AND NOT SHA1_TYPE STREQUAL "builtin")
ADD_DEFINITIONS(-DOPENSSL_SHA1) ADD_DEFINITIONS(-DOPENSSL_SHA1)
IF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") IF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment