diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2021-11-17 08:54:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-17 08:54:38 -0500 |
| commit | 1604be06685312f659675f3bc17b287108e00af1 (patch) | |
| tree | 58e2c2373e861c1d33d7cf33ba1355ecbc5b1ecc | |
| parent | 7a15213e3bdf9f8d459a34d0f16999ef4c6e2a85 (diff) | |
| parent | 1b8d14ac2a31eb48665ffbf2a984399a77ea62d8 (diff) | |
| download | libgit2-1604be06685312f659675f3bc17b287108e00af1.tar.gz | |
Merge pull request #6120 from libgit2/ethomson/cmake_test
cmake: re-enable WinHTTP
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cmake/SelectWinHTTP.cmake | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 664abc0d2..c414bbe3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,6 +111,7 @@ include(DefaultCFlags) add_subdirectory(src) if(BUILD_TESTS) + enable_testing() add_subdirectory(tests) endif() diff --git a/cmake/SelectWinHTTP.cmake b/cmake/SelectWinHTTP.cmake index 1d950c900..667b4007e 100644 --- a/cmake/SelectWinHTTP.cmake +++ b/cmake/SelectWinHTTP.cmake @@ -1,4 +1,4 @@ -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, diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b42359a63..84df92a45 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -68,8 +68,6 @@ function(ADD_CLAR_TEST name) endif() endfunction(ADD_CLAR_TEST) -enable_testing() - add_clar_test(offline -v -xonline) add_clar_test(invasive -v -score::ftruncate -sfilter::stream::bigfile -sodb::largefiles -siterator::workdir::filesystem_gunk -srepo::init -srepo::init::at_filesystem_root) add_clar_test(online -v -sonline -xonline::customcert) |