cmake: move Darwin-specific block around

tiennou · tiennou · commit 496771ec99cd · 2017-09-07T00:43:22.000+02:00
This allows us to only link against CoreFoundation when using the SecureTransport backend
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,12 +53,6 @@ OPTION( USE_EXT_HTTP_PARSER		"Use system HTTP_Parser if available" ON)
 OPTION( DEBUG_POOL			"Enable debug pool allocator"			OFF )
 OPTION( ENABLE_WERROR			"Enable compilation with -Werror"		OFF )
 
-IF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-	SET( USE_ICONV ON )
-	FIND_PACKAGE(Security)
-	FIND_PACKAGE(CoreFoundation REQUIRED)
-ENDIF()
-
 IF(MSVC)
 	# This option is only available when building with MSVC. By default, libgit2
 	# is build using the cdecl calling convention, which is useful if you're
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -92,11 +92,6 @@ IF(THREADSAFE)
 ENDIF()
 ADD_FEATURE_INFO(threadsafe THREADSAFE "threadsafe support")
 
-IF (COREFOUNDATION_FOUND)
-	LIST(APPEND LIBGIT2_LIBS ${COREFOUNDATION_LIBRARIES})
-	LIST(APPEND LIBGIT2_PC_LIBS ${COREFOUNDATION_LDFLAGS})
-ENDIF()
-
 
 IF (WIN32 AND EMBED_SSH_PATH)
 	FILE(GLOB SRC_SSH "${EMBED_SSH_PATH}/src/*.c")
@@ -128,7 +123,7 @@ ELSE ()
 	ENDIF ()
 
 	IF (NOT AMIGA AND (USE_HTTPS STREQUAL "OpenSSL" OR USE_HTTPS STREQUAL "ON"))
-		FIND_PACKAGE(OpenSSL)
+		FIND_PACKAGE(OpenSSL QUIET)
 	ENDIF ()
 
 	IF (CURL_FOUND)
@@ -142,6 +137,11 @@ ELSE ()
 ENDIF()
 
 IF (USE_HTTPS)
+	IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+		FIND_PACKAGE(Security)
+		FIND_PACKAGE(CoreFoundation)
+	ENDIF()
+
 	# Auto-select TLS backend
 	IF (USE_HTTPS STREQUAL ON)
 		IF (SECURITY_FOUND)
@@ -163,6 +163,9 @@ IF (USE_HTTPS)
 
 	# Check that we can find what's required for the selected backend
 	IF (HTTPS_BACKEND STREQUAL "SecureTransport")
+		IF (NOT COREFOUNDATION_FOUND)
+			MESSAGE(FATAL_ERROR "Cannot use SecureTransport backend, CoreFoundation.framework not found")
+		ENDIF()
 		IF (NOT SECURITY_FOUND)
 			MESSAGE(FATAL_ERROR "Cannot use SecureTransport backend, Security.framework not found")
 		ENDIF()
@@ -172,8 +175,8 @@ IF (USE_HTTPS)
 
 		SET(GIT_SECURE_TRANSPORT 1)
 		LIST(APPEND LIBGIT2_INCLUDES ${SECURITY_INCLUDE_DIR})
-		LIST(APPEND LIBGIT2_LIBS ${SECURITY_LIBRARIES})
-		LIST(APPEND LIBGIT2_PC_LIBS ${SECURITY_LDFLAGS})
+		LIST(APPEND LIBGIT2_LIBS ${COREFOUNDATION_LIBRARIES} ${SECURITY_LIBRARIES})
+		LIST(APPEND LIBGIT2_PC_LIBS ${COREFOUNDATION_LDFLAGS} ${SECURITY_LDFLAGS})
 	ELSEIF (HTTPS_BACKEND STREQUAL "OpenSSL")
 		IF (NOT OPENSSL_FOUND)
 			MESSAGE(FATAL_ERROR "Asked for OpenSSL TLS backend, but it wasn't found")
@@ -298,7 +301,7 @@ ENDIF()
 ADD_FEATURE_INFO(SPNEGO GIT_GSSAPI "SPNEGO authentication support")
 
 # Optional external dependency: iconv
-IF (USE_ICONV)
+IF (USE_ICONV OR CMAKE_SYSTEM_NAME MATCHES "Darwin")
 	FIND_PACKAGE(Iconv)
 ENDIF()
 IF (ICONV_FOUND)
