Merge pull request libgit2#6120 from libgit2/ethomson/cmake_test

ethomson · web-flow · commit 1604be066853 · 2021-11-17T08:54:38.000-05:00
cmake: re-enable WinHTTP
diff --git 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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-if(WIN32 AND WINHTTP)`
	`1`	`+if(WIN32 AND USE_WINHTTP)`
`2`	`2`	`set(GIT_WINHTTP 1)`
`3`	`3`
`4`	`4`	`# Since MinGW does not come with headers or an import library for winhttp,`