cmake: do not unset the deprecated mixed-case variables

To avoid interference with the calling env.

(Keep unsetting for the DIRS/DIR cases in BearSSL and mbedTLS, because
the deprecated variables play a new role in the detection.)

Follow-up to 9fbda4ca75483ee0a43289526e88d8f1e8ca2a78 #14574

diff --git a/CMake/FindWolfSSL.cmake b/CMake/FindWolfSSL.cmake
index c4f28dfaa9fc762ef16cbcb62d360d99b8cbed2d..cea44b00a1e6ffae511e17ea34970e74f23128c3 100644 (file)
--- a/CMake/FindWolfSSL.cmake
+++ b/CMake/FindWolfSSL.cmake
@@ -33,12 +33,10 @@
 if(DEFINED WolfSSL_INCLUDE_DIR AND NOT DEFINED WOLFSSL_INCLUDE_DIR)
   message(WARNING "WolfSSL_INCLUDE_DIR is deprecated, use WOLFSSL_INCLUDE_DIR instead.")
   set(WOLFSSL_INCLUDE_DIR "${WolfSSL_INCLUDE_DIR}")
-  unset(WolfSSL_INCLUDE_DIR)
 endif()
 if(DEFINED WolfSSL_LIBRARY AND NOT DEFINED WOLFSSL_LIBRARY)
   message(WARNING "WolfSSL_LIBRARY is deprecated, use WOLFSSL_LIBRARY instead.")
   set(WOLFSSL_LIBRARY "${WolfSSL_LIBRARY}")
-  unset(WolfSSL_LIBRARY)
 endif()
 
 if(CURL_USE_PKGCONFIG)

diff --git a/CMake/FindZstd.cmake b/CMake/FindZstd.cmake
index 72feb30c092b3923785f5c0027a3ecb28e020320..82fba01112432364219df047c73cf95f894f2be0 100644 (file)
--- a/CMake/FindZstd.cmake
+++ b/CMake/FindZstd.cmake
@@ -33,12 +33,10 @@
 if(DEFINED Zstd_INCLUDE_DIR AND NOT DEFINED ZSTD_INCLUDE_DIR)
   message(WARNING "Zstd_INCLUDE_DIR is deprecated, use ZSTD_INCLUDE_DIR instead.")
   set(ZSTD_INCLUDE_DIR "${Zstd_INCLUDE_DIR}")
-  unset(Zstd_INCLUDE_DIR)
 endif()
 if(DEFINED Zstd_LIBRARY AND NOT DEFINED ZSTD_LIBRARY)
   message(WARNING "Zstd_LIBRARY is deprecated, use ZSTD_LIBRARY instead.")
   set(ZSTD_LIBRARY "${Zstd_LIBRARY}")
-  unset(Zstd_LIBRARY)
 endif()
 
 if(CURL_USE_PKGCONFIG)