CMake: Use a normal components search in minizip.

1 files changed, 3 insertions, 11 deletions

diff --git a/contrib/minizip/minizipConfig.cmake.in b/contrib/minizip/minizipConfig.cmake.in
index 88ea0a08..f2fb3052 100644
--- a/contrib/minizip/minizipConfig.cmake.in
+++ b/contrib/minizip/minizipConfig.cmake.in
@@ -1,16 +1,8 @@
 @PACKAGE_INIT@
 
-set(_minizip_supported_components "")
+set(_MINIZIP_supported_components "shared" "static")
 include(CMakeFindDependencyMacro)
 
-if(@MINIZIP_BUILD_SHARED@)
-    list(APPEND _minizip_supported_components shared)
-endif(@MINIZIP_BUILD_SHARED@)
-
-if(@MINIZIP_BUILD_STATIC@)
-    list(APPEND _minizip_supported_components static)
-endif(@MINIZIP_BUILD_STATIC@)
-
 if(@MINIZIP_ENABLE_BZIP2@)
     find_dependency(BZip2)
 endif(@MINIZIP_ENABLE_BZIP2@)
@@ -29,7 +21,7 @@ if(minizip_FIND_COMPONENTS)
 else(minizip_FIND_COMPONENTS)
     find_dependency(ZLIB CONFIG)
 
-    foreach(_component_config IN LISTS _minizip_supported_components)
+    foreach(_component_config IN LISTS _MINIZIP_supported_components)
         include("${CMAKE_CURRENT_LIST_DIR}/minizip-${_component_config}.cmake")
-    endforeach(_component_config IN LISTS _minizip_supported_components)
+    endforeach(_component_config IN LISTS _MINIZIP_supported_components)
 endif(minizip_FIND_COMPONENTS)