diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2021-11-10 21:02:42 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2021-11-10 21:04:23 -0500 |
| commit | c8460b7d4e066e9367cf61dd329da6543c974f2c (patch) | |
| tree | e6c5aec1b68ad4d1c2c540c936338d7a3db33e6d | |
| parent | c033dd8a3e8f58f307d3e248a68b62252d3fc2c6 (diff) | |
| download | libgit2-c8460b7d4e066e9367cf61dd329da6543c974f2c.tar.gz | |
cmake: standardize USE_WINHTTP
WinHTTP can now be disabled with `USE_WINHTTP=OFF` instead of
`WINHTTP=OFF` to better support the other cmake semantics.
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/SelectHTTPSBackend.cmake | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c442d2a0..c8825e966 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,8 +93,8 @@ endif() if(WIN32) # By default, libgit2 is built with WinHTTP. To use the built-in - # HTTP transport, invoke CMake with the "-DWINHTTP=OFF" argument. - option(WINHTTP "Use Win32 WinHTTP routines" ON) + # HTTP transport, invoke CMake with the "-DUSE_WINHTTP=OFF" argument. + option(USE_WINHTTP "Use Win32 WinHTTP routines" ON) endif() diff --git a/cmake/SelectHTTPSBackend.cmake b/cmake/SelectHTTPSBackend.cmake index 4998f0f2a..4af747417 100644 --- a/cmake/SelectHTTPSBackend.cmake +++ b/cmake/SelectHTTPSBackend.cmake @@ -19,7 +19,7 @@ IF(USE_HTTPS) MESSAGE(STATUS "Security framework is too old, falling back to OpenSSL") SET(USE_HTTPS "OpenSSL") ENDIF() - ELSEIF (WINHTTP) + ELSEIF (USE_WINHTTP) SET(USE_HTTPS "WinHTTP") ELSEIF(OPENSSL_FOUND) SET(USE_HTTPS "OpenSSL") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index de8beefd8..eed04f8ee 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -98,7 +98,7 @@ if(WIN32 AND EMBED_SSH_PATH) set(GIT_SSH 1) endif() -if(WIN32 AND WINHTTP) +if(WIN32 AND USE_WINHTTP) set(GIT_WINHTTP 1) # Since MinGW does not come with headers or an import library for winhttp, |