proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-04 05:13:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: define GIT_HTTPS when HTTPS is supported

Browse Source
This commit is contained in:
Patrick Steinhardt 2017-04-25 10:14:19 +02:00
parent 0d2f6824eb
commit a4de1ae389
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -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()
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()

2
src/settings.c
View File

@ -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)

2
tests/online/badssl.c
View File

@ -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;