Commit a4de1ae3 by Patrick Steinhardt

cmake: define GIT_HTTPS when HTTPS is supported

parent 0d2f6824
...@@ -238,6 +238,7 @@ ENDIF() ...@@ -238,6 +238,7 @@ ENDIF()
IF (WIN32 AND WINHTTP) IF (WIN32 AND WINHTTP)
ADD_DEFINITIONS(-DGIT_WINHTTP) ADD_DEFINITIONS(-DGIT_WINHTTP)
ADD_DEFINITIONS(-DGIT_HTTPS)
# Since MinGW does not come with headers or an import library for winhttp, # Since MinGW does not come with headers or an import library for winhttp,
# we have to include a private header and generate our own import library # we have to include a private header and generate our own import library
...@@ -546,11 +547,13 @@ ENDIF() ...@@ -546,11 +547,13 @@ ENDIF()
IF (SECURITY_FOUND) IF (SECURITY_FOUND)
ADD_DEFINITIONS(-DGIT_SECURE_TRANSPORT) ADD_DEFINITIONS(-DGIT_SECURE_TRANSPORT)
ADD_DEFINITIONS(-DGIT_HTTPS)
INCLUDE_DIRECTORIES(${SECURITY_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${SECURITY_INCLUDE_DIR})
ENDIF () ENDIF ()
IF (OPENSSL_FOUND) IF (OPENSSL_FOUND)
ADD_DEFINITIONS(-DGIT_OPENSSL) ADD_DEFINITIONS(-DGIT_OPENSSL)
ADD_DEFINITIONS(-DGIT_HTTPS)
INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES}) SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES})
ENDIF() ENDIF()
......
...@@ -31,7 +31,7 @@ int git_libgit2_features(void) ...@@ -31,7 +31,7 @@ int git_libgit2_features(void)
#ifdef GIT_THREADS #ifdef GIT_THREADS
| GIT_FEATURE_THREADS | GIT_FEATURE_THREADS
#endif #endif
#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT) #ifdef GIT_HTTPS
| GIT_FEATURE_HTTPS | GIT_FEATURE_HTTPS
#endif #endif
#if defined(GIT_SSH) #if defined(GIT_SSH)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
static git_repository *g_repo; static git_repository *g_repo;
#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT) #ifdef GIT_HTTPS
static bool g_has_ssl = true; static bool g_has_ssl = true;
#else #else
static bool g_has_ssl = false; static bool g_has_ssl = false;
......
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