1 files changed, 28 insertions, 4 deletions

diff --git a/contrib/minizip/minizipConfig.cmake.in b/contrib/minizip/minizipConfig.cmake.in
index ba7ecde..ef0004d 100644
--- a/contrib/minizip/minizipConfig.cmake.in
+++ b/contrib/minizip/minizipConfig.cmake.in
@@ -1,6 +1,30 @@
-set(minizip_VERSION @minizip_VERSION@)
-set(MINIZIP_ENABLE_BZIP2 @BZIP2_FOUND@)
 @PACKAGE_INIT@
+
+set(_minizip_supported_components "")
 include(CMakeFindDependencyMacro)
-find_dependency(ZLIB CONFIG)
-INCLUDE (${CMAKE_CURRENT_LIST_DIR}/minizip.cmake)
+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_FIND_COMPONENTS)
+    find_dependency(ZLIB CONFIG COMPONENTS ${minizip_FIND_COMPONENTS})
+
+    foreach(_comp ${minizip_FIND_COMPONENTS})
+        if (NOT _comp IN_LIST _MINIZIP_supported_components)
+            set(minizip_FOUND False)
+            set(minizip_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}")
+        endif(NOT _comp IN_LIST _MINIZIP_supported_components)
+
+        include("${CMAKE_CURRENT_LIST_DIR}/minizip-${_comp}.cmake")
+    endforeach(_comp ${ZLIB_FIND_COMPONENTS})
+else(minizip_FIND_COMPONENTS)
+    find_dependency(ZLIB CONFIG)
+
+    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)
+endif(minizip_FIND_COMPONENTS)