Merge branch 'main' into zlib_config

Grab GLM removal from main.
Missed one of the LLVM configure blocks.
2024-10-15 16:12:37 -04:00 · 2024-10-15 16:08:03 -04:00 · 2024-10-15 13:36:03 -04:00 · 2024-10-15 13:35:24 -04:00 · 2024-10-15 13:35:05 -04:00 · 2024-10-15 13:33:10 -04:00
86 changed files with 1340 additions and 6888 deletions
@@ -6,34 +6,30 @@ if (ENABLE_APPLESEED)
  git_submodule_init(appleseed CMakeLists.txt)

  RegisterDeps(APPLESEED)
-  if (TARGET ZLIB_BLD)
-    set(Z_PREFIX_STR "brl_")
-  endif (TARGET ZLIB_BLD)

  ExternalProject_Add(APPLESEED_BLD
    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/appleseed"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    #PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/appleseed.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-    -DBOOST_ROOT=$<$<BOOL:${BOOST_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DEigen3_ROOT=$<$<BOOL:${EIGEN_BUNDLED}>:${CMAKE_NOBUNDLE_INSTALL_PREFIX}>
-    -DEMBREE_ROOT=$<$<BOOL:${EMBREE_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DISPC_ROOT=$<$<BOOL:${ISPC_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DTBB_ROOT=$<$<BOOL:${TBB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DJPEG_ROOT=$<$<BOOL:${JPEG_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DPNG_ROOT=$<$<BOOL:${PNG_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DTIFF_ROOT=$<$<BOOL:${TIFF_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DLLVM_ROOT=$<$<BOOL:${LLVM_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DLZ4_ROOT=$<$<BOOL:${LZ4_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DOPENCOLORIO_ROOT=$<$<BOOL:${OPENCOLORIO_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DOPENEXR_ROOT=$<$<BOOL:${OPENEXR_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DOPENIMAGEIO_ROOT=$<$<BOOL:${OPENIMAGEIO_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DOSL_ROOT=$<$<BOOL:${OSL_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DXERCES_C_ROOT=$<$<BOOL:${XERCES_C_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DZLIB_C_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${BOOST_TARGET}>:-DBOOST_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${EIGEN_BUNDLED}>:-DEigen3_ROOT=${CMAKE_NOBUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${EMBREE_TARGET}>:-DEMBREE_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ISPC_TARGET}>:-DISPC_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${JPEG_TARGET}>:-DJPEG_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${LLVM_TARGET}>:-DLLVM_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${LZ4_TARGET}>:-DLZ4_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${OPENCOLORIO_TARGET}>:-DOPENCOLORIO_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${OPENEXR_TARGET}>:-DOPENEXR_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${OPENIMAGEIO_TARGET}>:-DOPENIMAGEIO_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${OSL_TARGET}>:-DOSL_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${PNG_TARGET}>:-DPNG_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${TBB_TARGET}>:-DTBB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${TIFF_TARGET}>:-DTIFF_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${XERCES_C_TARGET}>:-DXERCES_C_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ZLIB_TARGET}>:-DZLIB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DWITH_STUDIO=OFF
    -DWITH_BENCH=OFF
    -DWITH_TOOLS=OFF
@@ -18,11 +18,13 @@ if (ENABLE_ASSETIMPORT)
  ExternalProject_Add(ASSETIMPORT_BLD
    URL "${CMAKE_CURRENT_SOURCE_DIR}/assimp"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
-    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/assetimport.patch
+    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/assetimport_code.patch
+    COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/assetimport_cmake.patch
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -Dpugixml_ROOT=$<$<BOOL:${PUGIXML_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DBIN_DIR=${BIN_DIR}
@@ -36,6 +38,7 @@ if (ENABLE_ASSETIMPORT)
    -DASSIMP_BUILD_ASSIMP_TOOLS=OFF
    -DASSIMP_BUILD_TESTS=OFF
    -DASSIMP_BUILD_MINIZIP=ON
+    -DASSIMP_BUILD_ZLIB=OFF
    -DASSIMP_INJECT_DEBUG_POSTFIX=OFF
    -DASSIMP_INSTALL_PDB=OFF
    DEPENDS ${ASSETIMPORT_DEPS}
@@ -1,270 +0,0 @@
-diff -Naur assimp/CMakeLists.txt ASSETIMPORT_BLD/CMakeLists.txt
--- assimp/CMakeLists.txt	2024-08-22 16:04:35.540387715 -0400
-+++ ASSETIMPORT_BLD/CMakeLists.txt	2024-08-22 16:05:12.765176737 -0400
-@@ -37,6 +37,7 @@
- SET(CMAKE_POLICY_DEFAULT_CMP0012 NEW)
- SET(CMAKE_POLICY_DEFAULT_CMP0074 NEW)
- SET(CMAKE_POLICY_DEFAULT_CMP0092 NEW)
-+SET(CMAKE_POLICY_DEFAULT_CMP0144 NEW)
- 
- CMAKE_MINIMUM_REQUIRED( VERSION 3.22 )
- 
-diff -Naur ASSETIMPORT/cmake-modules/FindZLIB.cmake ASSETIMPORT_BLD/cmake-modules/FindZLIB.cmake
--- ASSETIMPORT/cmake-modules/FindZLIB.cmake	2024-06-25 10:10:10.163683303 -0400
-+++ ASSETIMPORT_BLD/cmake-modules/FindZLIB.cmake	2024-06-25 10:08:14.147412121 -0400
-@@ -1,48 +1,123 @@
-#-------------------------------------------------------------------
-# This file is part of the CMake build system for OGRE
-#     (Object-oriented Graphics Rendering Engine)
-# For the latest info, see http://www.ogre3d.org/
-+#.rst:
-+# FindZLIB
-+# --------
- #
-# The contents of this file are placed in the public domain. Feel
-# free to make use of it in any way you like.
-#-------------------------------------------------------------------
-
-# - Try to find ZLIB
-# Once done, this will define
-+# Find the native ZLIB includes and library.
- #
-#  ZLIB_FOUND - system has ZLIB
-#  ZLIB_INCLUDE_DIRS - the ZLIB include directories
-#  ZLIB_LIBRARIES - link these to use ZLIB
-
-include(FindPkgMacros)
-findpkg_begin(ZLIB)
-
-# Get path, convert backslashes as ${ENV_${var}}
-getenv_path(ZLIB_HOME)
-
-# construct search paths
-set(ZLIB_PREFIX_PATH ${ZLIB_HOME} ${ENV_ZLIB_HOME})
-create_search_paths(ZLIB)
-# redo search if prefix path changed
-clear_if_changed(ZLIB_PREFIX_PATH
-  ZLIB_LIBRARY_FWK
-  ZLIB_LIBRARY_REL
-  ZLIB_LIBRARY_DBG
-  ZLIB_INCLUDE_DIR
-)
-
-set(ZLIB_LIBRARY_NAMES z zlib zdll)
-get_debug_names(ZLIB_LIBRARY_NAMES)
-
-use_pkgconfig(ZLIB_PKGC zzip-zlib-config)
-
-findpkg_framework(ZLIB)
-
-find_path(ZLIB_INCLUDE_DIR NAMES zlib.h HINTS ${ZLIB_INC_SEARCH_PATH} ${ZLIB_PKGC_INCLUDE_DIRS})
-find_library(ZLIB_LIBRARY_REL NAMES ${ZLIB_LIBRARY_NAMES} HINTS ${ZLIB_LIB_SEARCH_PATH} ${ZLIB_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel)
-find_library(ZLIB_LIBRARY_DBG NAMES ${ZLIB_LIBRARY_NAMES_DBG} HINTS ${ZLIB_LIB_SEARCH_PATH} ${ZLIB_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug)
-
-make_library_set(ZLIB_LIBRARY)
-
-findpkg_finish(ZLIB)
-+# IMPORTED Targets
-+# ^^^^^^^^^^^^^^^^
-+#
-+# This module defines :prop_tgt:`IMPORTED` target ``ZLIB::ZLIB``, if
-+# ZLIB has been found.
-+#
-+# Result Variables
-+# ^^^^^^^^^^^^^^^^
-+#
-+# This module defines the following variables:
-+#
-+# ::
-+#
-+#   ZLIB_INCLUDE_DIRS   - where to find zlib.h, etc.
-+#   ZLIB_LIBRARIES      - List of libraries when using zlib.
-+#   ZLIB_FOUND          - True if zlib found.
-+#
-+# ::
-+#
-+#   ZLIB_VERSION_STRING - The version of zlib found (x.y.z)
-+#   ZLIB_VERSION_MAJOR  - The major version of zlib
-+#   ZLIB_VERSION_MINOR  - The minor version of zlib
-+#   ZLIB_VERSION_PATCH  - The patch version of zlib
-+#   ZLIB_VERSION_TWEAK  - The tweak version of zlib
-+#
-+# Backward Compatibility
-+# ^^^^^^^^^^^^^^^^^^^^^^
-+#
-+# The following variable are provided for backward compatibility
-+#
-+# ::
-+#
-+#   ZLIB_MAJOR_VERSION  - The major version of zlib
-+#   ZLIB_MINOR_VERSION  - The minor version of zlib
-+#   ZLIB_PATCH_VERSION  - The patch version of zlib
-+#
-+# Hints
-+# ^^^^^
-+#
-+# A user may set ``ZLIB_ROOT`` to a zlib installation root to tell this
-+# module where to look.
- 
-+#=============================================================================
-+# Copyright 2001-2011 Kitware, Inc.
-+#
-+# Distributed under the OSI-approved BSD License (the "License");
-+# see accompanying file Copyright.txt for details.
-+#
-+# This software is distributed WITHOUT ANY WARRANTY; without even the
-+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+# See the License for more information.
-+#=============================================================================
-+# (To distribute this file outside of CMake, substitute the full
-+#  License text for the above reference.)
-+
-+set(_ZLIB_SEARCHES)
-+
-+# Search ZLIB_ROOT first if it is set.
-+if(ZLIB_ROOT)
-+  set(_ZLIB_SEARCH_ROOT PATHS ${ZLIB_ROOT} NO_DEFAULT_PATH)
-+  list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_ROOT)
-+endif()
-+
-+# Normal search.
-+set(_ZLIB_SEARCH_NORMAL
-+  PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]"
-+        "$ENV{PROGRAMFILES}/zlib"
-+  )
-+list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_NORMAL)
-+
-+set(ZLIB_NAMES z_brl z zlib zdll zlib1 zlibd zlibd1)
-+
-+# Try each search configuration.
-+foreach(search ${_ZLIB_SEARCHES})
-+  find_path(ZLIB_INCLUDE_DIR NAMES zlib.h        ${${search}} PATH_SUFFIXES include)
-+  find_library(ZLIB_LIBRARY  NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib)
-+endforeach()
-+
-+mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
-+
-+if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
-+    file(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$")
-+
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"([0-9]+).*$" "\\1" ZLIB_VERSION_MAJOR "${ZLIB_H}")
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_MINOR  "${ZLIB_H}")
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_PATCH "${ZLIB_H}")
-+    set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH}")
-+
-+    # only append a TWEAK version if it exists:
-+    set(ZLIB_VERSION_TWEAK "")
-+    if( "${ZLIB_H}" MATCHES "ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+)")
-+        set(ZLIB_VERSION_TWEAK "${CMAKE_MATCH_1}")
-+        set(ZLIB_VERSION_STRING "${ZLIB_VERSION_STRING}.${ZLIB_VERSION_TWEAK}")
-+    endif()
-+
-+    set(ZLIB_MAJOR_VERSION "${ZLIB_VERSION_MAJOR}")
-+    set(ZLIB_MINOR_VERSION "${ZLIB_VERSION_MINOR}")
-+    set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}")
-+endif()
-+
-+# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
-+# all listed variables are TRUE
-+include(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB REQUIRED_VARS ZLIB_LIBRARY ZLIB_INCLUDE_DIR
-+                                       VERSION_VAR ZLIB_VERSION_STRING)
-+
-+if(ZLIB_FOUND)
-+    set(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
-+    set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
-+
-+    if(NOT TARGET ZLIB::ZLIB)
-+      add_library(ZLIB::ZLIB UNKNOWN IMPORTED)
-+      set_target_properties(ZLIB::ZLIB PROPERTIES
-+        IMPORTED_LOCATION "${ZLIB_LIBRARY}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
-+    endif()
-+endif()
-diff -Naur ASSETIMPORT/code/AssetLib/MDL/MDLFileData.h ASSETIMPORT_BLD/code/AssetLib/MDL/MDLFileData.h
--- ASSETIMPORT/code/AssetLib/MDL/MDLFileData.h	2024-06-25 10:10:10.171683183 -0400
-+++ ASSETIMPORT_BLD/code/AssetLib/MDL/MDLFileData.h	2024-06-25 10:08:14.148412106 -0400
-@@ -876,7 +876,7 @@
-         : apcOutBones(),
-         iNum()
-     {
-        abNeedMaterials.reserve(10);
-+        //abNeedMaterials.reserve(10);
-     }
- 
-     //! Destruction: properly delete all allocated resources
-diff -Naur ASSETIMPORT/code/CMakeLists.txt ASSETIMPORT_BLD/code/CMakeLists.txt
--- ASSETIMPORT/code/CMakeLists.txt	2024-06-25 10:10:10.175683123 -0400
-+++ ASSETIMPORT_BLD/code/CMakeLists.txt	2024-06-25 10:08:14.149412091 -0400
-@@ -906,17 +906,18 @@
- SOURCE_GROUP( Extra FILES ${Extra_SRCS})
- 
- # pugixml
-IF(ASSIMP_HUNTER_ENABLED)
-  hunter_add_package(pugixml)
-  find_package(pugixml CONFIG REQUIRED)
-ELSE()
-  SET( Pugixml_SRCS
-    ../contrib/pugixml/src/pugiconfig.hpp
-    ../contrib/pugixml/src/pugixml.hpp
-  )
-  INCLUDE_DIRECTORIES("../contrib/pugixml/src")
-  SOURCE_GROUP( Contrib\\Pugixml FILES ${Pugixml_SRCS})
-ENDIF()
-+#IF(ASSIMP_HUNTER_ENABLED)
-+#  hunter_add_package(pugixml)
-+#  find_package(pugixml CONFIG REQUIRED)
-+#ELSE()
-+#  SET( Pugixml_SRCS
-+#    ../contrib/pugixml/src/pugiconfig.hpp
-+#    ../contrib/pugixml/src/pugixml.hpp
-+#  )
-+#  INCLUDE_DIRECTORIES("../contrib/pugixml/src")
-+#  SOURCE_GROUP( Contrib\\Pugixml FILES ${Pugixml_SRCS})
-+#ENDIF()
-+find_package(pugixml REQUIRED)
- 
- # utf8
- IF(ASSIMP_HUNTER_ENABLED)
-@@ -1268,6 +1269,10 @@
-   $<INSTALL_INTERFACE:${ASSIMP_INCLUDE_INSTALL_DIR}>
- )
- 
-+if (TARGET pugixml)
-+	set(PUGIXML_LIBRARIES pugixml)
-+endif (TARGET pugixml)
-+
- IF(ASSIMP_HUNTER_ENABLED)
-   TARGET_LINK_LIBRARIES(assimp
-       PUBLIC
-@@ -1289,7 +1294,7 @@
-     target_link_libraries(assimp PRIVATE ${draco_LIBRARIES})
-   endif()
- ELSE()
-  TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES})
-+  TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${PUGIXML_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES})
-   if (ASSIMP_BUILD_DRACO)
-     target_link_libraries(assimp ${draco_LIBRARIES})
-   endif()
-@@ -1307,6 +1312,7 @@
-   TARGET_LINK_LIBRARIES(assimp ${C4D_EXTRA_LIBRARIES})
- ENDIF ()
- 
-+if(0)
- if( MSVC )
-   # in order to prevent DLL hell, each of the DLLs have to be suffixed with the major version and msvc prefix
-   # CMake 3.12 added a variable for this
-@@ -1353,11 +1359,12 @@
-     target_compile_definitions(assimp PUBLIC WindowsStore)
-     TARGET_LINK_LIBRARIES(assimp advapi32)
- endif()
-+endif(0)
- 
- SET_TARGET_PROPERTIES( assimp PROPERTIES
-   VERSION ${ASSIMP_VERSION}
-   SOVERSION ${ASSIMP_SOVERSION} # use full version
-  OUTPUT_NAME assimp${LIBRARY_SUFFIX}
-+  #OUTPUT_NAME assimp${LIBRARY_SUFFIX}
- )
- 
- if (APPLE)
@@ -0,0 +1,111 @@
+diff -Naur assimp/CMakeLists.txt ASSETIMPORT_BLD/CMakeLists.txt
+--- assimp/CMakeLists.txt	2024-10-11 09:42:55.176363481 -0400
+++ ASSETIMPORT_BLD/CMakeLists.txt	2024-10-11 09:46:32.046826530 -0400
+@@ -37,6 +37,7 @@
+ SET(CMAKE_POLICY_DEFAULT_CMP0012 NEW)
+ SET(CMAKE_POLICY_DEFAULT_CMP0074 NEW)
+ SET(CMAKE_POLICY_DEFAULT_CMP0092 NEW)
+SET(CMAKE_POLICY_DEFAULT_CMP0144 NEW)
+ 
+ CMAKE_MINIMUM_REQUIRED( VERSION 3.22 )
+ 
+@@ -506,10 +507,10 @@
+   set(ASSIMP_BUILD_MINIZIP TRUE)
+ ELSE()
+   # If the zlib is already found outside, add an export in case assimpTargets can't find it.
+-  IF( ZLIB_FOUND AND ASSIMP_INSTALL)
+-    INSTALL( TARGETS zlib zlibstatic
+-        EXPORT "${TARGETS_EXPORT_NAME}")
+-  ENDIF()
+  #IF( ZLIB_FOUND AND ASSIMP_INSTALL)
+  #  INSTALL( TARGETS zlib zlibstatic
+  #      EXPORT "${TARGETS_EXPORT_NAME}")
+  #ENDIF()
+ 
+   IF ( NOT ASSIMP_BUILD_ZLIB )
+     FIND_PACKAGE(ZLIB)
+@@ -542,9 +543,7 @@
+     SET(ASSIMP_BUILD_MINIZIP 1)
+   ELSE()
+     ADD_DEFINITIONS(-DASSIMP_BUILD_NO_OWN_ZLIB)
+-    SET(ZLIB_LIBRARIES_LINKED -lz)
+   ENDIF()
+-  INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
+ ENDIF()
+ 
+ IF( NOT IOS )
+diff -Naur assimp/code/CMakeLists.txt ASSETIMPORT_BLD/code/CMakeLists.txt
+--- assimp/code/CMakeLists.txt	2024-10-11 09:42:55.177363459 -0400
+++ ASSETIMPORT_BLD/code/CMakeLists.txt	2024-10-11 09:47:03.945183936 -0400
+@@ -1050,17 +1050,18 @@
+ ENDIF() # IF (ASSIMP_BUILD_USD_IMPORTER)
+ 
+ # pugixml
+-IF(ASSIMP_HUNTER_ENABLED)
+-  hunter_add_package(pugixml)
+-  find_package(pugixml CONFIG REQUIRED)
+-ELSE()
+-  SET( Pugixml_SRCS
+-    ../contrib/pugixml/src/pugiconfig.hpp
+-    ../contrib/pugixml/src/pugixml.hpp
+-  )
+-  INCLUDE_DIRECTORIES("../contrib/pugixml/src")
+-  SOURCE_GROUP( Contrib\\Pugixml FILES ${Pugixml_SRCS})
+-ENDIF()
+#IF(ASSIMP_HUNTER_ENABLED)
+#  hunter_add_package(pugixml)
+#  find_package(pugixml CONFIG REQUIRED)
+#ELSE()
+#  SET( Pugixml_SRCS
+#    ../contrib/pugixml/src/pugiconfig.hpp
+#    ../contrib/pugixml/src/pugixml.hpp
+#  )
+#  INCLUDE_DIRECTORIES("../contrib/pugixml/src")
+#  SOURCE_GROUP( Contrib\\Pugixml FILES ${Pugixml_SRCS})
+#ENDIF()
+find_package(pugixml REQUIRED)
+ 
+ # utf8
+ IF(ASSIMP_HUNTER_ENABLED)
+@@ -1414,6 +1415,10 @@
+   $<INSTALL_INTERFACE:${ASSIMP_INCLUDE_INSTALL_DIR}>
+ )
+ 
+if (TARGET pugixml)
+	set(PUGIXML_LIBRARIES pugixml)
+endif (TARGET pugixml)
+
+ IF(ASSIMP_HUNTER_ENABLED)
+   TARGET_LINK_LIBRARIES(assimp
+       PUBLIC
+@@ -1435,7 +1440,7 @@
+     target_link_libraries(assimp PRIVATE ${draco_LIBRARIES})
+   endif()
+ ELSE()
+-  TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES})
+  TARGET_LINK_LIBRARIES(assimp ZLIB::ZLIB ${PUGIXML_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES})
+   if (ASSIMP_BUILD_DRACO)
+     target_link_libraries(assimp ${draco_LIBRARIES})
+   endif()
+@@ -1453,6 +1458,7 @@
+   TARGET_LINK_LIBRARIES(assimp ${C4D_EXTRA_LIBRARIES})
+ ENDIF ()
+ 
+if(0)
+ if( MSVC )
+   # in order to prevent DLL hell, each of the DLLs have to be suffixed with the major version and msvc prefix
+   # CMake 3.12 added a variable for this
+@@ -1499,11 +1505,12 @@
+     target_compile_definitions(assimp PUBLIC WindowsStore)
+     TARGET_LINK_LIBRARIES(assimp advapi32)
+ endif()
+endif(0)
+ 
+ SET_TARGET_PROPERTIES( assimp PROPERTIES
+   VERSION ${ASSIMP_VERSION}
+   SOVERSION ${ASSIMP_SOVERSION} # use full version
+-  OUTPUT_NAME assimp${LIBRARY_SUFFIX}
+  #OUTPUT_NAME assimp${LIBRARY_SUFFIX}
+ )
+ 
+ if (APPLE)
@@ -0,0 +1,11 @@
+--- assimp/code/AssetLib/MDL/MDLFileData.h	2024-10-09 16:05:51.708808296 -0400
+++ ASSETIMPORT_BLD/code/AssetLib/MDL/MDLFileData.h	2024-10-09 16:05:06.413473357 -0400
+@@ -876,7 +876,7 @@
+         : apcOutBones(),
+         iNum()
+     {
+-        abNeedMaterials.reserve(10);
+        //abNeedMaterials.reserve(10);
+     }
+ 
+     //! Destruction: properly delete all allocated resources
@@ -28,6 +28,7 @@ if (ENABLE_ASTYLE)
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/astyle.patch
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
    -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
@@ -7,22 +7,16 @@ if (ENABLE_BOOST)

  RegisterDeps(BOOST)

-  if (TARGET ZLIB_BLD)
-    set(Z_PREFIX_STR "brl_")
-  endif (TARGET ZLIB_BLD)
-
-
  ExternalProject_Add(BOOST_BLD
    URL "${CMAKE_CURRENT_SOURCE_DIR}/boost"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/boost_cmake.patch
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-    -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DICU_ROOT=$<$<BOOL:${ICU_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DZSTD_ROOT=$<$<BOOL:${ZSTD_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
+    $<$<BOOL:${ICU_TARGET}>:-DICU_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ZLIB_TARGET}>:-DZLIB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ZSTD_TARGET}>:-DZSTD_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DBOOST_IOSTREAMS_ENABLE_BZIP2=OFF
    -DBOOST_IOSTREAMS_ENABLE_LZMA=OFF
    -DBIN_DIR=${BIN_DIR}
@@ -17,6 +17,7 @@ if (ENABLE_CLIPPER2)
    #PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/clipper2.patch
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DCLIPPER2_UTILS=OFF
    -DCLIPPER2_EXAMPLES=OFF
    -DCLIPPER2_TESTS=OFF
@@ -12,6 +12,7 @@ if (ENABLE_DEFLATE)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DDEFLATE_BUILD_CLI=OFF
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
@@ -33,6 +33,7 @@ if (ENABLE_EIGEN)
    -DEIGEN_BUILD_DOC=OFF
    -DEIGEN_BUILD_PKGCONFIG=OFF
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
    -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
@@ -6,9 +6,6 @@ if (ENABLE_EMBREE)
  git_submodule_init(embree CMakeLists.txt)

  RegisterDeps(EMBREE)
-  if (TARGET ZLIB_BLD)
-    set(Z_PREFIX_STR "brl_")
-  endif (TARGET ZLIB_BLD)

  ExternalProject_Add(EMBREE_BLD
    URL "${CMAKE_CURRENT_SOURCE_DIR}/embree"
@@ -16,13 +13,12 @@ if (ENABLE_EMBREE)
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/embree.patch
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-    -DTBB_ROOT=$<$<BOOL:${TBB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DISPC_ROOT=$<$<BOOL:${ISPC_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DEMBREE_TUTORIALS=OFF
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
+    $<$<BOOL:${TBB_TARGET}>:-DTBB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ISPC_TARGET}>:-DISPC_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ZLIB_TARGET}>:-DZLIB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    $<$<BOOL:${USE_OSPRAY}>:-DEMBREE_ISPC_SUPPORT=ON>
+    -DEMBREE_TUTORIALS=OFF
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
    -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
@@ -14,6 +14,7 @@ if (ENABLE_EXPAT)
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/expat.patch
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DEXPAT_SHARED_LIBS=ON
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
@@ -23,6 +23,7 @@ if (WIN32 AND ENABLE_FLEX)
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/winflexbison.patch
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
    -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
@@ -11,6 +11,7 @@ if (ENABLE_FMT)
    URL "${CMAKE_CURRENT_SOURCE_DIR}/fmt"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DFMT_DOC=OFF
    -DFMT_TEST=OFF
    ${BUILD_TYPE_SPECIFIER}
@@ -10,18 +10,16 @@ if (ENABLE_GDAL)
  git_submodule_init(gdal CMakeLists.txt)

  RegisterDeps(GDAL)
-  if (TARGET ZLIB_BLD)
-    set(Z_PREFIX_STR "brl_")
-  endif (TARGET ZLIB_BLD)

  ExternalProject_Add(GDAL_BLD
    URL "${CMAKE_CURRENT_SOURCE_DIR}/gdal"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
-    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/gdal.patch
+    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/gdal_cmake.patch
+    COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/gdal_cpl.patch
+    COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/gdal_gcore.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
    -DCMAKE_INSTALL_LIBDIR:PATH=${LIB_DIR}
@@ -1,350 +0,0 @@
-diff -Naurw gdal-3.6.3/cmake/modules/FindPNG.cmake gdal/cmake/modules/FindPNG.cmake
--- gdal-3.6.3/cmake/modules/FindPNG.cmake	1969-12-31 19:00:00.000000000 -0500
-+++ gdal/cmake/modules/FindPNG.cmake	2023-08-17 10:20:09.862683802 -0400
-@@ -0,0 +1,161 @@
-+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-+# file Copyright.txt or https://cmake.org/licensing for details.
-+
-+#[=======================================================================[.rst:
-+FindPNG
-+-------
-+
-+Find libpng, the official reference library for the PNG image format.
-+
-+Imported targets
-+^^^^^^^^^^^^^^^^
-+
-+.. versionadded:: 3.5
-+
-+This module defines the following :prop_tgt:`IMPORTED` target:
-+
-+``PNG::PNG``
-+  The libpng library, if found.
-+
-+Result variables
-+^^^^^^^^^^^^^^^^
-+
-+This module will set the following variables in your project:
-+
-+``PNG_INCLUDE_DIRS``
-+  where to find png.h, etc.
-+``PNG_LIBRARIES``
-+  the libraries to link against to use PNG.
-+``PNG_DEFINITIONS``
-+  You should add_definitions(${PNG_DEFINITIONS}) before compiling code
-+  that includes png library files.
-+``PNG_FOUND``
-+  If false, do not try to use PNG.
-+``PNG_VERSION_STRING``
-+  the version of the PNG library found (since CMake 2.8.8)
-+
-+Obsolete variables
-+^^^^^^^^^^^^^^^^^^
-+
-+The following variables may also be set, for backwards compatibility:
-+
-+``PNG_LIBRARY``
-+  where to find the PNG library.
-+``PNG_INCLUDE_DIR``
-+  where to find the PNG headers (same as PNG_INCLUDE_DIRS)
-+
-+Since PNG depends on the ZLib compression library, none of the above
-+will be defined unless ZLib can be found.
-+#]=======================================================================]
-+
-+if(PNG_FIND_QUIETLY)
-+  set(_FIND_ZLIB_ARG QUIET)
-+endif()
-+find_package(ZLIB ${_FIND_ZLIB_ARG})
-+
-+if(ZLIB_FOUND)
-+  find_path(PNG_PNG_INCLUDE_DIR png.h PATH_SUFFIXES include/libpng)
-+  mark_as_advanced(PNG_PNG_INCLUDE_DIR)
-+
-+  list(APPEND PNG_NAMES png_brl libpng_brl png libpng)
-+  unset(PNG_NAMES_DEBUG)
-+  set(_PNG_VERSION_SUFFIXES 17 16 15 14 12)
-+  if (PNG_FIND_VERSION MATCHES "^([0-9]+)\\.([0-9]+)(\\..*)?$")
-+    set(_PNG_VERSION_SUFFIX_MIN "${CMAKE_MATCH_1}${CMAKE_MATCH_2}")
-+    if (PNG_FIND_VERSION_EXACT)
-+      set(_PNG_VERSION_SUFFIXES ${_PNG_VERSION_SUFFIX_MIN})
-+    else ()
-+      string(REGEX REPLACE
-+          "${_PNG_VERSION_SUFFIX_MIN}.*" "${_PNG_VERSION_SUFFIX_MIN}"
-+          _PNG_VERSION_SUFFIXES "${_PNG_VERSION_SUFFIXES}")
-+    endif ()
-+    unset(_PNG_VERSION_SUFFIX_MIN)
-+  endif ()
-+  foreach(v IN LISTS _PNG_VERSION_SUFFIXES)
-+    list(APPEND PNG_NAMES png_brl${v} libpng_brl${v} png${v} libpng${v} libpng${v}_static)
-+    list(APPEND PNG_NAMES_DEBUG png_brl${v}d libpng_brl${v}d png${v}d libpng${v}d libpng${v}_staticd)
-+  endforeach()
-+  unset(_PNG_VERSION_SUFFIXES)
-+  # For compatibility with versions prior to this multi-config search, honor
-+  # any PNG_LIBRARY that is already specified and skip the search.
-+  if(NOT PNG_LIBRARY)
-+    find_library(PNG_LIBRARY_RELEASE NAMES ${PNG_NAMES} NAMES_PER_DIR)
-+    find_library(PNG_LIBRARY_DEBUG NAMES ${PNG_NAMES_DEBUG} NAMES_PER_DIR)
-+    include(SelectLibraryConfigurations)
-+    select_library_configurations(PNG)
-+    mark_as_advanced(PNG_LIBRARY_RELEASE PNG_LIBRARY_DEBUG)
-+  endif()
-+  unset(PNG_NAMES)
-+  unset(PNG_NAMES_DEBUG)
-+
-+  # Set by select_library_configurations(), but we want the one from
-+  # find_package_handle_standard_args() below.
-+  unset(PNG_FOUND)
-+
-+  if (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)
-+      # png.h includes zlib.h. Sigh.
-+      set(PNG_INCLUDE_DIRS ${PNG_PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
-+      set(PNG_INCLUDE_DIR ${PNG_INCLUDE_DIRS} ) # for backward compatibility
-+      set(PNG_LIBRARIES ${PNG_LIBRARY} ${ZLIB_LIBRARY})
-+      if((CMAKE_SYSTEM_NAME STREQUAL "Linux") AND
-+         ("${PNG_LIBRARY}" MATCHES "\\${CMAKE_STATIC_LIBRARY_SUFFIX}$"))
-+        list(APPEND PNG_LIBRARIES m)
-+      endif()
-+
-+      if (CYGWIN)
-+        if(BUILD_SHARED_LIBS)
-+           # No need to define PNG_USE_DLL here, because it's default for Cygwin.
-+        else()
-+          set (PNG_DEFINITIONS -DPNG_STATIC)
-+          set(_PNG_COMPILE_DEFINITIONS PNG_STATIC)
-+        endif()
-+      endif ()
-+
-+      if(NOT TARGET PNG::PNG)
-+        add_library(PNG::PNG UNKNOWN IMPORTED)
-+        set_target_properties(PNG::PNG PROPERTIES
-+          INTERFACE_COMPILE_DEFINITIONS "${_PNG_COMPILE_DEFINITIONS}"
-+          INTERFACE_INCLUDE_DIRECTORIES "${PNG_INCLUDE_DIRS}"
-+          INTERFACE_LINK_LIBRARIES ZLIB::ZLIB)
-+        if((CMAKE_SYSTEM_NAME STREQUAL "Linux") AND
-+           ("${PNG_LIBRARY}" MATCHES "\\${CMAKE_STATIC_LIBRARY_SUFFIX}$"))
-+          set_property(TARGET PNG::PNG APPEND PROPERTY
-+            INTERFACE_LINK_LIBRARIES m)
-+        endif()
-+
-+        if(EXISTS "${PNG_LIBRARY}")
-+          set_target_properties(PNG::PNG PROPERTIES
-+            IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-+            IMPORTED_LOCATION "${PNG_LIBRARY}")
-+        endif()
-+        if(EXISTS "${PNG_LIBRARY_RELEASE}")
-+          set_property(TARGET PNG::PNG APPEND PROPERTY
-+            IMPORTED_CONFIGURATIONS RELEASE)
-+          set_target_properties(PNG::PNG PROPERTIES
-+            IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
-+            IMPORTED_LOCATION_RELEASE "${PNG_LIBRARY_RELEASE}")
-+        endif()
-+        if(EXISTS "${PNG_LIBRARY_DEBUG}")
-+          set_property(TARGET PNG::PNG APPEND PROPERTY
-+            IMPORTED_CONFIGURATIONS DEBUG)
-+          set_target_properties(PNG::PNG PROPERTIES
-+            IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
-+            IMPORTED_LOCATION_DEBUG "${PNG_LIBRARY_DEBUG}")
-+        endif()
-+      endif()
-+
-+      unset(_PNG_COMPILE_DEFINITIONS)
-+  endif ()
-+
-+  if (PNG_PNG_INCLUDE_DIR AND EXISTS "${PNG_PNG_INCLUDE_DIR}/png.h")
-+      file(STRINGS "${PNG_PNG_INCLUDE_DIR}/png.h" png_version_str REGEX "^#define[ \t]+PNG_LIBPNG_VER_STRING[ \t]+\".+\"")
-+
-+      string(REGEX REPLACE "^#define[ \t]+PNG_LIBPNG_VER_STRING[ \t]+\"([^\"]+)\".*" "\\1" PNG_VERSION_STRING "${png_version_str}")
-+      unset(png_version_str)
-+  endif ()
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(PNG
-+                                  REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR
-+                                  VERSION_VAR PNG_VERSION_STRING)
-diff -Naur gdal/cmake/modules/packages/FindSQLite3.cmake GDAL_BLD/cmake/modules/packages/FindSQLite3.cmake
--- gdal/cmake/modules/packages/FindSQLite3.cmake	2024-06-25 09:56:45.835498631 -0400
-+++ GDAL_BLD/cmake/modules/packages/FindSQLite3.cmake	2024-06-25 09:59:46.365399374 -0400
-@@ -57,7 +57,7 @@
-             NAMES  sqlite3.h
-             HINTS ${PC_SQLITE3_INCLUDE_DIRS})
-   find_library(SQLite3_LIBRARY
-               NAMES sqlite3 sqlite3_i
-+               NAMES sqlite3 sqlite3_i libsqlite3 libsqlite libsqlite3_i
-                HINTS ${PC_SQLITE3_LIBRARY_DIRS})
- endif()
- 
- # Extract version information from the header file
-diff -Naurw gdal-3.6.3/cmake/modules/packages/FindZLIB.cmake gdal/cmake/modules/packages/FindZLIB.cmake
--- gdal-3.6.3/cmake/modules/packages/FindZLIB.cmake	1969-12-31 19:00:00.000000000 -0500
-+++ gdal/cmake/modules/packages/FindZLIB.cmake	2023-08-17 10:20:09.866683737 -0400
-@@ -0,0 +1,123 @@
-+#.rst:
-+# FindZLIB
-+# --------
-+#
-+# Find the native ZLIB includes and library.
-+#
-+# IMPORTED Targets
-+# ^^^^^^^^^^^^^^^^
-+#
-+# This module defines :prop_tgt:`IMPORTED` target ``ZLIB::ZLIB``, if
-+# ZLIB has been found.
-+#
-+# Result Variables
-+# ^^^^^^^^^^^^^^^^
-+#
-+# This module defines the following variables:
-+#
-+# ::
-+#
-+#   ZLIB_INCLUDE_DIRS   - where to find zlib.h, etc.
-+#   ZLIB_LIBRARIES      - List of libraries when using zlib.
-+#   ZLIB_FOUND          - True if zlib found.
-+#
-+# ::
-+#
-+#   ZLIB_VERSION_STRING - The version of zlib found (x.y.z)
-+#   ZLIB_VERSION_MAJOR  - The major version of zlib
-+#   ZLIB_VERSION_MINOR  - The minor version of zlib
-+#   ZLIB_VERSION_PATCH  - The patch version of zlib
-+#   ZLIB_VERSION_TWEAK  - The tweak version of zlib
-+#
-+# Backward Compatibility
-+# ^^^^^^^^^^^^^^^^^^^^^^
-+#
-+# The following variable are provided for backward compatibility
-+#
-+# ::
-+#
-+#   ZLIB_MAJOR_VERSION  - The major version of zlib
-+#   ZLIB_MINOR_VERSION  - The minor version of zlib
-+#   ZLIB_PATCH_VERSION  - The patch version of zlib
-+#
-+# Hints
-+# ^^^^^
-+#
-+# A user may set ``ZLIB_ROOT`` to a zlib installation root to tell this
-+# module where to look.
-+
-+#=============================================================================
-+# Copyright 2001-2011 Kitware, Inc.
-+#
-+# Distributed under the OSI-approved BSD License (the "License");
-+# see accompanying file Copyright.txt for details.
-+#
-+# This software is distributed WITHOUT ANY WARRANTY; without even the
-+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+# See the License for more information.
-+#=============================================================================
-+# (To distribute this file outside of CMake, substitute the full
-+#  License text for the above reference.)
-+
-+set(_ZLIB_SEARCHES)
-+
-+# Search ZLIB_ROOT first if it is set.
-+if(ZLIB_ROOT)
-+  set(_ZLIB_SEARCH_ROOT PATHS ${ZLIB_ROOT} NO_DEFAULT_PATH)
-+  list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_ROOT)
-+endif()
-+
-+# Normal search.
-+set(_ZLIB_SEARCH_NORMAL
-+  PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]"
-+        "$ENV{PROGRAMFILES}/zlib"
-+  )
-+list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_NORMAL)
-+
-+set(ZLIB_NAMES z_brl z zlib zdll zlib1 zlibd zlibd1)
-+
-+# Try each search configuration.
-+foreach(search ${_ZLIB_SEARCHES})
-+  find_path(ZLIB_INCLUDE_DIR NAMES zlib.h        ${${search}} PATH_SUFFIXES include)
-+  find_library(ZLIB_LIBRARY  NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib)
-+endforeach()
-+
-+mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
-+
-+if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
-+    file(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$")
-+
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"([0-9]+).*$" "\\1" ZLIB_VERSION_MAJOR "${ZLIB_H}")
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_MINOR  "${ZLIB_H}")
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_PATCH "${ZLIB_H}")
-+    set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH}")
-+
-+    # only append a TWEAK version if it exists:
-+    set(ZLIB_VERSION_TWEAK "")
-+    if( "${ZLIB_H}" MATCHES "ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+)")
-+        set(ZLIB_VERSION_TWEAK "${CMAKE_MATCH_1}")
-+        set(ZLIB_VERSION_STRING "${ZLIB_VERSION_STRING}.${ZLIB_VERSION_TWEAK}")
-+    endif()
-+
-+    set(ZLIB_MAJOR_VERSION "${ZLIB_VERSION_MAJOR}")
-+    set(ZLIB_MINOR_VERSION "${ZLIB_VERSION_MINOR}")
-+    set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}")
-+endif()
-+
-+# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
-+# all listed variables are TRUE
-+include(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB REQUIRED_VARS ZLIB_LIBRARY ZLIB_INCLUDE_DIR
-+                                       VERSION_VAR ZLIB_VERSION_STRING)
-+
-+if(ZLIB_FOUND)
-+    set(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
-+    set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
-+
-+    if(NOT TARGET ZLIB::ZLIB)
-+      add_library(ZLIB::ZLIB UNKNOWN IMPORTED)
-+      set_target_properties(ZLIB::ZLIB PROPERTIES
-+        IMPORTED_LOCATION "${ZLIB_LIBRARY}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
-+    endif()
-+endif()
-diff -Naur gdal/gcore/gdal_priv.h GDAL_BLD/gcore/gdal_priv.h
--- gdal/gcore/gdal_priv.h	2024-06-26 17:01:06.199711566 -0400
-+++ GDAL_BLD/gcore/gdal_priv.h	2024-06-26 17:00:48.433037793 -0400
-@@ -96,6 +96,13 @@
- /*                       GDALMultiDomainMetadata                        */
- /************************************************************************/
- 
-+#if defined(_WIN32)
-+#define STRCASECMP(a, b) (_stricmp(a, b))
-+#else
-+/** Alias for strcasecmp() */
-+#define STRCASECMP(a, b) (strcasecmp(a, b))
-+#endif
-+
- //! @cond Doxygen_Suppress
- class CPL_DLL GDALMultiDomainMetadata
- {
-diff -Naur gdal/gdal.cmake GDAL_BLD/gdal.cmake
--- gdal/gdal.cmake	2024-06-25 09:56:45.660500506 -0400
-+++ GDAL_BLD/gdal.cmake	2024-06-25 09:55:37.834206511 -0400
-@@ -379,12 +379,6 @@
- set_property(TARGET ${GDAL_LIB_TARGET_NAME} PROPERTY PLUGIN_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/gdalplugins")
- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/gdalplugins")
- 
-if (MSVC)
-  set(GDAL_DEBUG_POSTFIX
-      "d"
-      CACHE STRING "Postfix to add to the GDAL dll name for debug builds")
-  set_target_properties(${GDAL_LIB_TARGET_NAME} PROPERTIES DEBUG_POSTFIX "${GDAL_DEBUG_POSTFIX}")
-endif ()
- if (MINGW AND BUILD_SHARED_LIBS)
-     set_target_properties(${GDAL_LIB_TARGET_NAME} PROPERTIES SUFFIX "-${GDAL_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
- endif ()
-diff -Naur gdal/port/cpl_port.h GDAL_BLD/port/cpl_port.h
--- gdal/port/cpl_port.h	2024-06-25 09:56:45.954497348 -0400
-+++ GDAL_BLD/port/cpl_port.h	2024-06-25 09:55:37.836206491 -0400
-@@ -1123,7 +1123,7 @@
- #define TRUE 1
- #endif
- 
-#if __clang_major__ >= 4 || (__clang_major__ == 3 && __clang_minor__ >= 8)
-+#if defined(__clang_major__) && (__clang_major__ >= 4 || ( __clang_major__ == 3 && __clang_minor__ >= 8) )
- #define CPL_NOSANITIZE_UNSIGNED_INT_OVERFLOW                                   \
-     __attribute__((no_sanitize("unsigned-integer-overflow")))
- #else
@@ -0,0 +1,28 @@
+diff -Naur gdal/cmake/modules/packages/FindSQLite3.cmake GDAL_BLD/cmake/modules/packages/FindSQLite3.cmake
+--- gdal/cmake/modules/packages/FindSQLite3.cmake	2024-10-11 12:56:24.150252794 -0400
+++ GDAL_BLD/cmake/modules/packages/FindSQLite3.cmake	2024-10-11 12:55:32.592163336 -0400
+@@ -57,7 +57,7 @@
+             NAMES  sqlite3.h
+             HINTS ${PC_SQLITE3_INCLUDE_DIRS})
+   find_library(SQLite3_LIBRARY
+-               NAMES sqlite3 sqlite3_i
+               NAMES sqlite3 sqlite3_i libsqlite3 libsqlite libsqlite3_i
+                HINTS ${PC_SQLITE3_LIBRARY_DIRS})
+ endif()
+ 
+diff -Naur gdal/gdal.cmake GDAL_BLD/gdal.cmake
+--- gdal/gdal.cmake	2024-10-11 12:56:24.291250306 -0400
+++ GDAL_BLD/gdal.cmake	2024-10-11 12:55:32.595163283 -0400
+@@ -379,12 +379,6 @@
+ set_property(TARGET ${GDAL_LIB_TARGET_NAME} PROPERTY PLUGIN_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/gdalplugins")
+ file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/gdalplugins")
+ 
+-if (MSVC)
+-  set(GDAL_DEBUG_POSTFIX
+-      "d"
+-      CACHE STRING "Postfix to add to the GDAL dll name for debug builds")
+-  set_target_properties(${GDAL_LIB_TARGET_NAME} PROPERTIES DEBUG_POSTFIX "${GDAL_DEBUG_POSTFIX}")
+-endif ()
+ if (MINGW AND BUILD_SHARED_LIBS)
+     set_target_properties(${GDAL_LIB_TARGET_NAME} PROPERTIES SUFFIX "-${GDAL_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ endif ()
@@ -0,0 +1,11 @@
+--- gdal/port/cpl_port.h	2024-10-11 12:56:24.357249142 -0400
+++ GDAL_BLD/port/cpl_port.h	2024-10-11 12:55:32.596163265 -0400
+@@ -1123,7 +1123,7 @@
+ #define TRUE 1
+ #endif
+ 
+-#if __clang_major__ >= 4 || (__clang_major__ == 3 && __clang_minor__ >= 8)
+#if defined(__clang_major__) && (__clang_major__ >= 4 || ( __clang_major__ == 3 && __clang_minor__ >= 8) )
+ #define CPL_NOSANITIZE_UNSIGNED_INT_OVERFLOW                                   \
+     __attribute__((no_sanitize("unsigned-integer-overflow")))
+ #else
@@ -0,0 +1,16 @@
+--- gdal/gcore/gdal_priv.h	2024-10-11 12:56:24.284250430 -0400
+++ GDAL_BLD/gcore/gdal_priv.h	2024-10-11 12:55:32.594163301 -0400
+@@ -96,6 +96,13 @@
+ /*                       GDALMultiDomainMetadata                        */
+ /************************************************************************/
+ 
+#if defined(_WIN32)
+#define STRCASECMP(a, b) (_stricmp(a, b))
+#else
+/** Alias for strcasecmp() */
+#define STRCASECMP(a, b) (strcasecmp(a, b))
+#endif
+
+ //! @cond Doxygen_Suppress
+ class CPL_DLL GDALMultiDomainMetadata
+ {
@@ -18,6 +18,7 @@ if (ENABLE_GEOGRAM)
    COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/geogram_win32.patch
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
    -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
@@ -30,6 +30,7 @@ if (ENABLE_GTE)
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/gte.patch
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DCMAKE_INSTALL_PREFIX=${CMAKE_NOBUNDLE_INSTALL_PREFIX}
    LOG_CONFIGURE ${EXT_BUILD_QUIET}
    LOG_BUILD ${EXT_BUILD_QUIET}
@@ -12,9 +12,6 @@ if (ENABLE_ISPC)
  git_submodule_init(ispc CMakeLists.txt)

  RegisterDeps(ISPC)
-  if (TARGET ZLIB_BLD)
-    set(Z_PREFIX_STR "brl_")
-  endif (TARGET ZLIB_BLD)

  # ispc depends on the clang compiler - its build will switch the compiler if
  # not already using clang.  Need to pass in the bundled LLVM clang compiler
@@ -25,14 +22,13 @@ if (ENABLE_ISPC)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-    -DFLEX_ROOT=$<$<BOOL:${FLEX_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DBISON_ROOT=$<$<BOOL:${BISON_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DCurses_ROOT=$<$<BOOL:${NCURSES_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DLLVM_ROOT=$<$<BOOL:${LLVM_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
+    $<$<BOOL:${BISON_TARGET}>:-DBISON_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${FLEX_TARGET}>:-DFLEX_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    $<$<BOOL:${LLVM_TARGET}>:-DLLVM_CONFIG_EXECUTABLE=${CMAKE_BUNDLE_INSTALL_PREFIX}/bin/llvm-config>
+    $<$<BOOL:${LLVM_TARGET}>:-DLLVM_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${NCURSES_TARGET}>:-DCurses_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ZLIB_TARGET}>:-DZLIB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DISPC_INCLUDE_EXAMPLES=OFF
    -DISPC_INCLUDE_DPCPP_EXAMPLES=OFF
    -DISPC_INCLUDE_TESTS=OFF
@@ -41,8 +37,6 @@ if (ENABLE_ISPC)
    -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
    -DCMAKE_CXX_COMPILER=$<IF:${LLVM_TARGET},${CMAKE_BUNDLE_INSTALL_PREFIX}/bin/clang++,${CMAKE_CXX_COMPILER}>
    -DCMAKE_C_COMPILER=$<IF:${LLVM_TARGET},${CMAKE_BUNDLE_INSTALL_PREFIX}/bin/clang,${CMAKE_C_COMPILER}>
-    #-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-    #-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
    -DCMAKE_INSTALL_PREFIX=${CMAKE_BUNDLE_INSTALL_PREFIX}
    -DCMAKE_INSTALL_LIBDIR:PATH=${LIB_DIR}
    -DCMAKE_INSTALL_RPATH=${CMAKE_BUNDLE_INSTALL_PREFIX}/${LIB_DIR}
@@ -90,6 +90,7 @@ if (ENABLE_ITCL)
    COMMAND ${TCL_HDRS_PATCH_CMD}
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DBIN_DIR=$<IF:$<BOOL:${WIN32}>,${LIB_DIR},${BIN_DIR}>
    -DLIB_DIR=${LIB_DIR}
    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -99,7 +100,7 @@ if (ENABLE_ITCL)
    -DINCLUDE_DIR=${INCLUDE_DIR}
    -DSHARED_DIR=${LIB_DIR}
    -DTCL_ENABLE_TK=ON
-    -DTCL_ROOT=$<$<BOOL:${TCL_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${TCL_TARGET}>:-DTCL_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DTCL_PRIVATE_HDRS=${TCL_PRIVATE_HDRS}
    -DTCL_PRIVATE_HDRS_OS=${TCL_PRIVATE_HDRS_OS}
    LOG_CONFIGURE ${EXT_BUILD_QUIET}
@@ -59,6 +59,7 @@ if (ENABLE_ITK)
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/itk.patch
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DBIN_DIR=$<IF:$<BOOL:${WIN32}>,${LIB_DIR},${BIN_DIR}>
    -DLIB_DIR=${LIB_DIR}
    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -66,10 +67,10 @@ if (ENABLE_ITK)
    -DCMAKE_INSTALL_PREFIX=${CMAKE_BUNDLE_INSTALL_PREFIX}
    -DCMAKE_INSTALL_RPATH=${CMAKE_BUNDLE_INSTALL_PREFIX}/${LIB_DIR}/${RPATH_SUFFIX}
    -DINCLUDE_DIR=${INCLUDE_DIR}
-    -DITCL_ROOT=$<$<BOOL:${ITCL_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ITCL_TARGET}>:-DITCL_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DSHARED_DIR=${LIB_DIR}
    -DTCL_ENABLE_TK=ON
-    -DTCL_ROOT=$<$<BOOL:${TCL_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${TCL_TARGET}>:-DTCL_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DTCL_SOURCE_DIR=${CMAKE_SOURCE_DIR}/tcl/tcl
    -DTK_SOURCE_DIR=${CMAKE_SOURCE_DIR}/tk/tk
    LOG_CONFIGURE ${EXT_BUILD_QUIET}
@@ -30,6 +30,7 @@ if (ENABLE_IWIDGETS)
    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/iwidgets"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DCMAKE_INSTALL_PREFIX=${CMAKE_BUNDLE_INSTALL_PREFIX}
    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
@@ -17,6 +17,7 @@ if (ENABLE_JPEG)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
    -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
@@ -17,6 +17,7 @@ if (ENABLE_LEMON)
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/lemon_cmake.patch
    COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/lemon_brlcad.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
@@ -18,6 +18,7 @@ if (NOT MSVC AND NOT APPLE)
      BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
      PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/lief.patch
      CMAKE_ARGS
+      -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
      ${BUILD_TYPE_SPECIFIER}
      -DBIN_DIR=${BIN_DIR}
      -DLIB_DIR=${LIB_DIR}
@@ -16,6 +16,7 @@ if (ENABLE_LINENOISE)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/linenoise.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
@@ -13,7 +13,6 @@ if (ENABLE_LLVM)
  # activation of a patch flipping the variable to COMMAND for subsequent uses.
  set(PATCH_CMD "PATCH_COMMAND")
  if (TARGET ZLIB_BLD)
-    set(Z_PREFIX_STR "brl_")
    set(Z_BRL_PATCH_CMD "COMMAND;${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/llvm_z_brl.patch")
  endif (TARGET ZLIB_BLD)

@@ -38,10 +37,9 @@ if (ENABLE_LLVM)
      ${Z_BRL_PATCH_CMD}
      CMAKE_ARGS
      -C ${CMAKE_CURRENT_SOURCE_DIR}/llvm_targets.cmake
+      -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
      ${BUILD_TYPE_SPECIFIER}
-      $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-      $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-      -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+      $<$<BOOL:${ZLIB_TARGET}>:-DZLIB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
      -DLLVM_BUILD_DOCS=OFF
      -DLLVM_BUILD_EXAMPLES=OFF
      -DLLVM_ENABLE_LIBEDIT=OFF
@@ -82,8 +80,6 @@ if (ENABLE_LLVM)
      CMAKE_ARGS
      -C ${CMAKE_CURRENT_SOURCE_DIR}/llvm_targets.cmake
      -DCMAKE_BUILD_TYPE=Release
-      $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-      $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
      -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
      -DLLVM_BUILD_DOCS=OFF
      -DLLVM_BUILD_EXAMPLES=OFF
@@ -16,6 +16,7 @@ if (ENABLE_LMDB)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/lmdb.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
@@ -12,6 +12,7 @@ if (ENABLE_LZ4)
    SOURCE_SUBDIR build/cmake
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DLZ4_BUILD_CLI=OFF
    -DBIN_DIR=${BIN_DIR}
@@ -15,10 +15,9 @@ if (ENABLE_MANIFOLD)
    URL "${CMAKE_CURRENT_SOURCE_DIR}/manifold"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-    -DASSETIMPORT_ROOT=$<$<BOOL:${ASSETIMPORT_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ASSETIMPORT_TARGET}>:-DASSETIMPORT_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DMANIFOLD_TEST=OFF
    -DMANIFOLD_EXPORT=ON
    -DGLM_BUILD_LIBRARY=OFF
@@ -6,20 +6,16 @@ if (ENABLE_MINIZIP_NG)
  git_submodule_init(minizip-ng CMakeLists.txt)

  RegisterDeps(MINIZIP_NG)
-  if (TARGET ZLIB_BLD)
-    set(Z_PREFIX_STR "brl_")
-  endif (TARGET ZLIB_BLD)

  ExternalProject_Add(MINIZIP_NG_BLD
    URL "${CMAKE_CURRENT_SOURCE_DIR}/minizip-ng"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/minizip-ng.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-    -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DZSTD_ROOT=$<$<BOOL:${ZSTD_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ZLIB_TARGET}>:-DZLIB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ZSTD_TARGET}>:-DZSTD_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DMZ_BZIP2=OFF
    -DMZ_ICONV=OFF
    -DMZ_LIBBSD=OFF
@@ -17,6 +17,7 @@ if (ENABLE_MMESH)
    CMAKE_ARGS
    -DMMESH_BUILD_EXAMPLES=OFF
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
    -DCMAKE_INSTALL_PREFIX=${CMAKE_BUNDLE_INSTALL_PREFIX}
@@ -15,6 +15,7 @@ if (ENABLE_NETPBM)
    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/netpbm"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
@@ -25,6 +25,7 @@ if (ENABLE_ONETBB)
    URL "${CMAKE_CURRENT_SOURCE_DIR}/oneTBB"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DTBB_TEST=OFF
    -DBIN_DIR=${BIN_DIR}
@@ -6,25 +6,21 @@ if (ENABLE_OPENCOLORIO)
  git_submodule_init(OpenColorIO CMakeLists.txt)

  RegisterDeps(OPENCOLORIO)
-  if (TARGET ZLIB_BLD)
-    set(Z_PREFIX_STR "brl_")
-  endif (TARGET ZLIB_BLD)

  ExternalProject_Add(OPENCOLORIO_BLD
    URL "${CMAKE_CURRENT_SOURCE_DIR}/OpenColorIO"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opencolorio.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-    -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -Dzstd_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -Dpystring_ROOT=$<$<BOOL:${PYSTRING_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -Dminizip_ROOT=$<$<BOOL:${MINIZIP_NG_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -Dminizip_DIR=$<$<BOOL:${MINIZIP_NG_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}/lib/cmake/minizip>
-    -Dexpat_ROOT=$<$<BOOL:${EXPAT_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -Dyaml-cpp_ROOT=$<$<BOOL:${YAML_CPP_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${EXPAT_TARGET}>:-Dexpat_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${MINIZIP_NG_TARGET}>:-Dminizip_DIR=${CMAKE_BUNDLE_INSTALL_PREFIX}/lib/cmake/minizip>
+    $<$<BOOL:${MINIZIP_NG_TARGET}>:-Dminizip_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${PYSTRING_TARGET}>:-Dpystring_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${YAML_CPP_TARGET}>:-Dyaml-cpp_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ZLIB_TARGET}>:-DZLIB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ZSTD_TARGET}>:-Dzstd_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DBUILD_TESTING=OFF
    -DOCIO_BUILD_APPS=OFF
    -DOCIO_BUILD_DOCS=OFF
@@ -10,21 +10,17 @@ if (ENABLE_OPENCV)
  git_submodule_init(opencv CMakeLists.txt)

  RegisterDeps(OPENCV)
-  if (TARGET ZLIB_BLD)
-    set(Z_PREFIX_STR "brl_")
-  endif (TARGET ZLIB_BLD)

  ExternalProject_Add(OPENCV_BLD
    URL "${CMAKE_CURRENT_SOURCE_DIR}/opencv"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
-    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opencv.patch
+    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opencv_cmake.patch
    CMAKE_ARGS
    -DMIN_VER_CMAKE=3.19
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-    $<$<BOOL:${ZLIB_TARGET}>:-DZLIB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    $<$<BOOL:${PNG_TARGET}>:-DPNG_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ZLIB_TARGET}>:-DZLIB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
    -DCMAKE_INSTALL_LIBDIR:PATH=${LIB_DIR}
@@ -1,379 +0,0 @@
-diff -Naur opencv/.cache/.gitignore OPENCV_BLD/.cache/.gitignore
--- opencv/.cache/.gitignore	1969-12-31 19:00:00.000000000 -0500
-+++ OPENCV_BLD/.cache/.gitignore	2024-03-06 11:14:00.970668988 -0500
-@@ -0,0 +1 @@
-+*
-diff -Naur opencv/cmake/FindPNG.cmake OPENCV_BLD/cmake/FindPNG.cmake
--- opencv/cmake/FindPNG.cmake	1969-12-31 19:00:00.000000000 -0500
-+++ OPENCV_BLD/cmake/FindPNG.cmake	2024-03-06 11:14:00.642674496 -0500
-@@ -0,0 +1,190 @@
-+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-+# file Copyright.txt or https://cmake.org/licensing for details.
-+
-+#[=======================================================================[.rst:
-+FindPNG
-+-------
-+
-+Find libpng, the official reference library for the PNG image format.
-+
-+Imported targets
-+^^^^^^^^^^^^^^^^
-+
-+.. versionadded:: 3.5
-+
-+This module defines the following :prop_tgt:`IMPORTED` target:
-+
-+``PNG::PNG``
-+The libpng library, if found.
-+
-+Result variables
-+^^^^^^^^^^^^^^^^
-+
-+This module will set the following variables in your project:
-+
-+``PNG_INCLUDE_DIRS``
-+where to find png.h, etc.
-+``PNG_LIBRARIES``
-+the libraries to link against to use PNG.
-+``PNG_DEFINITIONS``
-+You should add_definitions(${PNG_DEFINITIONS}) before compiling code
-+that includes png library files.
-+``PNG_FOUND``
-+If false, do not try to use PNG.
-+``PNG_VERSION_STRING``
-+the version of the PNG library found (since CMake 2.8.8)
-+
-+Obsolete variables
-+^^^^^^^^^^^^^^^^^^
-+
-+The following variables may also be set, for backwards compatibility:
-+
-+``PNG_LIBRARY``
-+where to find the PNG library.
-+``PNG_INCLUDE_DIR``
-+where to find the PNG headers (same as PNG_INCLUDE_DIRS)
-+
-+Since PNG depends on the ZLib compression library, none of the above
-+will be defined unless ZLib can be found.
-+#]=======================================================================]
-+
-+if(PNG_FIND_QUIETLY)
-+  set(_FIND_ZLIB_ARG QUIET)
-+endif()
-+find_package(ZLIB ${_FIND_ZLIB_ARG})
-+
-+if(ZLIB_FOUND)
-+  set(_PNG_SEARCHES)
-+
-+  # Search PNG_ROOT first if it is set.
-+  if(PNG_ROOT)
-+    set(_PNG_SEARCH_ROOT PATHS ${PNG_ROOT} NO_DEFAULT_PATH)
-+    list(APPEND _PNG_SEARCHES _PNG_SEARCH_ROOT)
-+  endif()
-+
-+  list(APPEND PNG_NAMES png_brl libpng_brl png libpng)
-+  unset(PNG_NAMES_DEBUG)
-+  set(_PNG_VERSION_SUFFIXES 17 16 15 14 12)
-+  if (PNG_FIND_VERSION MATCHES "^([0-9]+)\\.([0-9]+)(\\..*)?$")
-+    set(_PNG_VERSION_SUFFIX_MIN "${CMAKE_MATCH_1}${CMAKE_MATCH_2}")
-+    if (PNG_FIND_VERSION_EXACT)
-+      set(_PNG_VERSION_SUFFIXES ${_PNG_VERSION_SUFFIX_MIN})
-+    else ()
-+      string(REGEX REPLACE
-+	"${_PNG_VERSION_SUFFIX_MIN}.*" "${_PNG_VERSION_SUFFIX_MIN}"
-+	_PNG_VERSION_SUFFIXES "${_PNG_VERSION_SUFFIXES}")
-+    endif ()
-+    unset(_PNG_VERSION_SUFFIX_MIN)
-+  endif ()
-+  foreach(v IN LISTS _PNG_VERSION_SUFFIXES)
-+    list(APPEND PNG_NAMES png_brl${v} libpng_brl${v} png${v} libpng${v} libpng${v}_static)
-+    list(APPEND PNG_NAMES_DEBUG png_brl${v}d libpng_brl${v}d png${v}d libpng${v}d libpng${v}_staticd)
-+  endforeach()
-+  unset(_PNG_VERSION_SUFFIXES)
-+
-+  # Try each search configuration.
-+  # For compatibility with versions prior to this multi-config search, honor
-+  # any PNG_LIBRARY that is already specified and skip the search.
-+  if(NOT PNG_LIBRARY)
-+    foreach(search ${_PNG_SEARCHES})
-+      find_path(PNG_PNG_INCLUDE_DIR png.h ${${search}} PATH_SUFFIXES include include/libpng)
-+      find_library(PNG_LIBRARY_RELEASE    ${${search}} NAMES ${PNG_NAMES} NAMES_PER_DIR PATH_SUFFIXES lib)
-+      find_library(PNG_LIBRARY_DEBUG      ${${search}} NAMES ${PNG_NAMES_DEBUG} NAMES_PER_DIR PATH_SUFFIXES lib)
-+      include(SelectLibraryConfigurations)
-+      select_library_configurations(PNG)
-+      mark_as_advanced(PNG_LIBRARY_RELEASE PNG_LIBRARY_DEBUG)
-+    endforeach()
-+  endif()
-+
-+  mark_as_advanced(PNG_LIBRARY)
-+  mark_as_advanced(PNG_PNG_INCLUDE_DIR)
-+
-+  # If we still don't have PNG_LIBRARY, try without specifying search paths
-+  if(NOT PNG_LIBRARY)
-+    find_library(PNG_LIBRARY_RELEASE NAMES ${PNG_NAMES} NAMES_PER_DIR PATH_SUFFIXES lib)
-+    find_library(PNG_LIBRARY_DEBUG NAMES ${PNG_NAMES_DEBUG} NAMES_PER_DIR PATH_SUFFIXES lib)
-+    include(SelectLibraryConfigurations)
-+    select_library_configurations(PNG)
-+    mark_as_advanced(PNG_LIBRARY_RELEASE PNG_LIBRARY_DEBUG)
-+  endif()
-+  unset(PNG_NAMES)
-+  unset(PNG_NAMES_DEBUG)
-+
-+  # Set by select_library_configurations(), but we want the one from
-+  # find_package_handle_standard_args() below.
-+  unset(PNG_FOUND)
-+
-+  if (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)
-+    # png.h includes zlib.h. Sigh.
-+    set(PNG_INCLUDE_DIRS ${PNG_PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
-+    set(PNG_INCLUDE_DIR ${PNG_INCLUDE_DIRS} ) # for backward compatibility
-+    set(PNG_LIBRARIES ${PNG_LIBRARY} ${ZLIB_LIBRARY})
-+    if((CMAKE_SYSTEM_NAME STREQUAL "Linux") AND
-+      ("${PNG_LIBRARY}" MATCHES "\\${CMAKE_STATIC_LIBRARY_SUFFIX}$"))
-+      list(APPEND PNG_LIBRARIES m)
-+    endif()
-+
-+    if (CYGWIN)
-+      if(BUILD_SHARED_LIBS)
-+	# No need to define PNG_USE_DLL here, because it's default for Cygwin.
-+      else()
-+	set (PNG_DEFINITIONS -DPNG_STATIC)
-+	set(_PNG_COMPILE_DEFINITIONS PNG_STATIC)
-+      endif()
-+    endif ()
-+
-+    if(NOT TARGET PNG::PNG)
-+      add_library(PNG::PNG UNKNOWN IMPORTED)
-+      set_target_properties(PNG::PNG PROPERTIES
-+	INTERFACE_COMPILE_DEFINITIONS "${_PNG_COMPILE_DEFINITIONS}"
-+	INTERFACE_INCLUDE_DIRECTORIES "${PNG_INCLUDE_DIRS}"
-+	INTERFACE_LINK_LIBRARIES ZLIB::ZLIB)
-+      if((CMAKE_SYSTEM_NAME STREQUAL "Linux") AND
-+	("${PNG_LIBRARY}" MATCHES "\\${CMAKE_STATIC_LIBRARY_SUFFIX}$"))
-+	set_property(TARGET PNG::PNG APPEND PROPERTY
-+	  INTERFACE_LINK_LIBRARIES m)
-+      endif()
-+
-+      if(EXISTS "${PNG_LIBRARY}")
-+	set_target_properties(PNG::PNG PROPERTIES
-+	  IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-+	  IMPORTED_LOCATION "${PNG_LIBRARY}")
-+      endif()
-+      if(EXISTS "${PNG_LIBRARY_RELEASE}")
-+	set_property(TARGET PNG::PNG APPEND PROPERTY
-+	  IMPORTED_CONFIGURATIONS RELEASE)
-+	set_target_properties(PNG::PNG PROPERTIES
-+	  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
-+	  IMPORTED_LOCATION_RELEASE "${PNG_LIBRARY_RELEASE}")
-+      endif()
-+      if(EXISTS "${PNG_LIBRARY_DEBUG}")
-+	set_property(TARGET PNG::PNG APPEND PROPERTY
-+	  IMPORTED_CONFIGURATIONS DEBUG)
-+	set_target_properties(PNG::PNG PROPERTIES
-+	  IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
-+	  IMPORTED_LOCATION_DEBUG "${PNG_LIBRARY_DEBUG}")
-+      endif()
-+    endif()
-+
-+    unset(_PNG_COMPILE_DEFINITIONS)
-+  endif ()
-+
-+  if (PNG_PNG_INCLUDE_DIR AND EXISTS "${PNG_PNG_INCLUDE_DIR}/png.h")
-+    file(STRINGS "${PNG_PNG_INCLUDE_DIR}/png.h" png_version_str REGEX "^#define[ \t]+PNG_LIBPNG_VER_STRING[ \t]+\".+\"")
-+
-+    string(REGEX REPLACE "^#define[ \t]+PNG_LIBPNG_VER_STRING[ \t]+\"([^\"]+)\".*" "\\1" PNG_VERSION_STRING "${png_version_str}")
-+    unset(png_version_str)
-+  endif ()
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(PNG
-+  REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR
-+  VERSION_VAR PNG_VERSION_STRING)
-+
-+# Local Variables:
-+# tab-width: 8
-+# mode: cmake
-+# indent-tabs-mode: t
-+# End:
-+# ex: shiftwidth=2 tabstop=8
-diff -Naur opencv/cmake/FindZLIB.cmake OPENCV_BLD/cmake/FindZLIB.cmake
--- opencv/cmake/FindZLIB.cmake	1969-12-31 19:00:00.000000000 -0500
-+++ OPENCV_BLD/cmake/FindZLIB.cmake	2024-03-06 11:14:00.642674496 -0500
-@@ -0,0 +1,123 @@
-+#.rst:
-+# FindZLIB
-+# --------
-+#
-+# Find the native ZLIB includes and library.
-+#
-+# IMPORTED Targets
-+# ^^^^^^^^^^^^^^^^
-+#
-+# This module defines :prop_tgt:`IMPORTED` target ``ZLIB::ZLIB``, if
-+# ZLIB has been found.
-+#
-+# Result Variables
-+# ^^^^^^^^^^^^^^^^
-+#
-+# This module defines the following variables:
-+#
-+# ::
-+#
-+#   ZLIB_INCLUDE_DIRS   - where to find zlib.h, etc.
-+#   ZLIB_LIBRARIES      - List of libraries when using zlib.
-+#   ZLIB_FOUND          - True if zlib found.
-+#
-+# ::
-+#
-+#   ZLIB_VERSION_STRING - The version of zlib found (x.y.z)
-+#   ZLIB_VERSION_MAJOR  - The major version of zlib
-+#   ZLIB_VERSION_MINOR  - The minor version of zlib
-+#   ZLIB_VERSION_PATCH  - The patch version of zlib
-+#   ZLIB_VERSION_TWEAK  - The tweak version of zlib
-+#
-+# Backward Compatibility
-+# ^^^^^^^^^^^^^^^^^^^^^^
-+#
-+# The following variable are provided for backward compatibility
-+#
-+# ::
-+#
-+#   ZLIB_MAJOR_VERSION  - The major version of zlib
-+#   ZLIB_MINOR_VERSION  - The minor version of zlib
-+#   ZLIB_PATCH_VERSION  - The patch version of zlib
-+#
-+# Hints
-+# ^^^^^
-+#
-+# A user may set ``ZLIB_ROOT`` to a zlib installation root to tell this
-+# module where to look.
-+
-+#=============================================================================
-+# Copyright 2001-2011 Kitware, Inc.
-+#
-+# Distributed under the OSI-approved BSD License (the "License");
-+# see accompanying file Copyright.txt for details.
-+#
-+# This software is distributed WITHOUT ANY WARRANTY; without even the
-+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+# See the License for more information.
-+#=============================================================================
-+# (To distribute this file outside of CMake, substitute the full
-+#  License text for the above reference.)
-+
-+set(_ZLIB_SEARCHES)
-+
-+# Search ZLIB_ROOT first if it is set.
-+if(ZLIB_ROOT)
-+  set(_ZLIB_SEARCH_ROOT PATHS ${ZLIB_ROOT} NO_DEFAULT_PATH)
-+  list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_ROOT)
-+endif()
-+
-+# Normal search.
-+set(_ZLIB_SEARCH_NORMAL
-+  PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]"
-+        "$ENV{PROGRAMFILES}/zlib"
-+  )
-+list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_NORMAL)
-+
-+set(ZLIB_NAMES z_brl z zlib zdll zlib1 zlibd zlibd1)
-+
-+# Try each search configuration.
-+foreach(search ${_ZLIB_SEARCHES})
-+  find_path(ZLIB_INCLUDE_DIR NAMES zlib.h        ${${search}} PATH_SUFFIXES include)
-+  find_library(ZLIB_LIBRARY  NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib)
-+endforeach()
-+
-+mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
-+
-+if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
-+    file(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$")
-+
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"([0-9]+).*$" "\\1" ZLIB_VERSION_MAJOR "${ZLIB_H}")
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_MINOR  "${ZLIB_H}")
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_PATCH "${ZLIB_H}")
-+    set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH}")
-+
-+    # only append a TWEAK version if it exists:
-+    set(ZLIB_VERSION_TWEAK "")
-+    if( "${ZLIB_H}" MATCHES "ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+)")
-+        set(ZLIB_VERSION_TWEAK "${CMAKE_MATCH_1}")
-+        set(ZLIB_VERSION_STRING "${ZLIB_VERSION_STRING}.${ZLIB_VERSION_TWEAK}")
-+    endif()
-+
-+    set(ZLIB_MAJOR_VERSION "${ZLIB_VERSION_MAJOR}")
-+    set(ZLIB_MINOR_VERSION "${ZLIB_VERSION_MINOR}")
-+    set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}")
-+endif()
-+
-+# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
-+# all listed variables are TRUE
-+include(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB REQUIRED_VARS ZLIB_LIBRARY ZLIB_INCLUDE_DIR
-+                                       VERSION_VAR ZLIB_VERSION_STRING)
-+
-+if(ZLIB_FOUND)
-+    set(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
-+    set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
-+
-+    if(NOT TARGET ZLIB::ZLIB)
-+      add_library(ZLIB::ZLIB UNKNOWN IMPORTED)
-+      set_target_properties(ZLIB::ZLIB PROPERTIES
-+        IMPORTED_LOCATION "${ZLIB_LIBRARY}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
-+    endif()
-+endif()
-diff -Naur opencv/cmake/OpenCVInstallLayout.cmake OPENCV_BLD/cmake/OpenCVInstallLayout.cmake
--- opencv/cmake/OpenCVInstallLayout.cmake	2024-03-06 11:15:18.249391428 -0500
-+++ OPENCV_BLD/cmake/OpenCVInstallLayout.cmake	2024-03-06 11:14:00.642674496 -0500
-@@ -22,12 +22,12 @@
- 
- elseif(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
- 
-  if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
-    ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
-  else()
-    message(STATUS "Can't detect runtime and/or arch")
-+	#if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
-+	#ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
-+	#else()
-+	#message(STATUS "Can't detect runtime and/or arch")
-     ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "")
-  endif()
-+	#endif()
-   if(OpenCV_STATIC)
-     ocv_update(OPENCV_INSTALL_BINARIES_SUFFIX "staticlib")
-   else()
-diff -Naur opencv/CMakeLists.txt OPENCV_BLD/CMakeLists.txt
--- opencv/CMakeLists.txt	2024-06-25 10:25:05.539691869 -0400
-+++ OPENCV_BLD/CMakeLists.txt	2024-06-25 10:28:39.828624534 -0400
-@@ -13,6 +13,8 @@
- ")
- endif()
- 
-+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-+
- include(cmake/OpenCVMinDepVersions.cmake)
- 
- if(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
-@@ -68,6 +70,10 @@
-   cmake_policy(SET CMP0071 NEW)  # CMake 3.10+: Let `AUTOMOC` and `AUTOUIC` process `GENERATED` files.
- endif()
- 
-+if (POLICY CMP0074)
-+  cmake_policy(SET CMP0074 NEW)  # CMake 3.12+: find_package() uses <PackageName>_ROOT variables.
-+endif (POLICY CMP0074)
-+
- if(POLICY CMP0075)
-   cmake_policy(SET CMP0075 NEW)  # CMake 3.12+: Include file check macros honor `CMAKE_REQUIRED_LIBRARIES`
- endif()
-@@ -1154,7 +1160,7 @@
- if(ANDROID OR NOT UNIX)
-   install(FILES ${OPENCV_LICENSE_FILE}
-         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-        DESTINATION ./ COMPONENT libs)
-+        DESTINATION doc/legal/other/opencv COMPONENT libs)
-   if(OPENCV_README_FILE)
-     install(FILES ${OPENCV_README_FILE}
-             PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
@@ -0,0 +1,81 @@
+diff -Naur opencv/cmake/OpenCVInstallLayout.cmake OPENCV_BLD/cmake/OpenCVInstallLayout.cmake
+--- opencv/cmake/OpenCVInstallLayout.cmake	2024-10-11 12:49:34.114560179 -0400
+++ OPENCV_BLD/cmake/OpenCVInstallLayout.cmake	2024-10-11 12:47:31.106792946 -0400
+@@ -22,12 +22,12 @@
+ 
+ elseif(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
+ 
+-  if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
+-    ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
+-  else()
+-    message(STATUS "Can't detect runtime and/or arch")
+	#if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
+	#ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
+	#else()
+	#message(STATUS "Can't detect runtime and/or arch")
+     ocv_update(OPENCV_INSTALL_BINARIES_PREFIX "")
+-  endif()
+	#endif()
+   if(OpenCV_STATIC)
+     ocv_update(OPENCV_INSTALL_BINARIES_SUFFIX "staticlib")
+   else()
+diff -Naur opencv/CMakeLists.txt OPENCV_BLD/CMakeLists.txt
+--- opencv/CMakeLists.txt	2024-10-11 12:49:34.061561135 -0400
+++ OPENCV_BLD/CMakeLists.txt	2024-10-11 12:50:02.916040772 -0400
+@@ -68,6 +68,10 @@
+   cmake_policy(SET CMP0071 NEW)  # CMake 3.10+: Let `AUTOMOC` and `AUTOUIC` process `GENERATED` files.
+ endif()
+ 
+if (POLICY CMP0074)
+  cmake_policy(SET CMP0074 NEW)  # CMake 3.12+: find_package() uses <PackageName>_ROOT variables.
+endif (POLICY CMP0074)
+
+ if(POLICY CMP0075)
+   cmake_policy(SET CMP0075 NEW)  # CMake 3.12+: Include file check macros honor `CMAKE_REQUIRED_LIBRARIES`
+ endif()
+@@ -1154,7 +1158,7 @@
+ if(ANDROID OR NOT UNIX)
+   install(FILES ${OPENCV_LICENSE_FILE}
+         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-        DESTINATION ./ COMPONENT libs)
+        DESTINATION doc/legal/other/opencv COMPONENT libs)
+   if(OPENCV_README_FILE)
+     install(FILES ${OPENCV_README_FILE}
+             PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+diff -Naur opencv/modules/core/CMakeLists.txt OPENCV_BLD/modules/core/CMakeLists.txt
+--- opencv/modules/core/CMakeLists.txt	2024-10-11 12:49:34.193558751 -0400
+++ OPENCV_BLD/modules/core/CMakeLists.txt	2024-10-11 12:47:31.108792909 -0400
+@@ -95,7 +95,7 @@
+ ocv_glob_module_sources(SOURCES "${OPENCV_MODULE_opencv_core_BINARY_DIR}/version_string.inc"
+                         HEADERS ${core_parallel_hdrs} ${module_opencl_hdrs} ${lib_cuda_hdrs} ${lib_cuda_hdrs_detail})
+ 
+-ocv_module_include_directories(${the_module} ${ZLIB_INCLUDE_DIRS} ${OPENCL_INCLUDE_DIRS})
+ocv_module_include_directories(${the_module} ${OPENCL_INCLUDE_DIRS})
+ if(ANDROID AND HAVE_CPUFEATURES)
+   ocv_append_source_file_compile_definitions(${CMAKE_CURRENT_SOURCE_DIR}/src/system.cpp "HAVE_CPUFEATURES=1")
+   ocv_module_include_directories(${CPUFEATURES_INCLUDE_DIRS})
+@@ -166,7 +166,7 @@
+ ocv_create_module(${extra_libs})
+ 
+ ocv_target_link_libraries(${the_module} PRIVATE
+-    "${ZLIB_LIBRARIES}" "${OPENCL_LIBRARIES}" "${VA_LIBRARIES}"
+	 ZLIB::ZLIB "${OPENCL_LIBRARIES}" "${VA_LIBRARIES}"
+     "${OPENGL_LIBRARIES}"
+     "${GLX_LIBRARIES}"
+     "${LAPACK_LIBRARIES}" "${CPUFEATURES_LIBRARIES}" "${HALIDE_LIBRARIES}"
+diff -Naur opencv/modules/imgcodecs/CMakeLists.txt OPENCV_BLD/modules/imgcodecs/CMakeLists.txt
+--- opencv/modules/imgcodecs/CMakeLists.txt	2024-10-11 12:49:34.252557687 -0400
+++ OPENCV_BLD/modules/imgcodecs/CMakeLists.txt	2024-10-11 12:47:31.108792909 -0400
+@@ -38,7 +38,11 @@
+ if(HAVE_PNG)
+   add_definitions(${PNG_DEFINITIONS})
+   ocv_include_directories(${PNG_INCLUDE_DIR})
+-  list(APPEND GRFMT_LIBS ${PNG_LIBRARIES})
+  if(TARGET PNG::PNG)
+	 list(APPEND GRFMT_LIBS PNG::PNG)
+  else(TARGET PNG::PNG)
+    list(APPEND GRFMT_LIBS ${PNG_LIBRARIES})
+  endif(TARGET PNG::PNG)
+ endif()
+ 
+ if(HAVE_GDCM)
@@ -11,6 +11,7 @@ if (ENABLE_OPENEXR)
    URL "${CMAKE_CURRENT_SOURCE_DIR}/openexr"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DOPENEXR_BUILD_CLI=OFF
    -DBIN_DIR=${BIN_DIR}
@@ -6,26 +6,22 @@ if (ENABLE_OPENIMAGEIO)
  git_submodule_init(oiio CMakeLists.txt)

  RegisterDeps(OPENIMAGEIO)
-  if (TARGET ZLIB_BLD)
-    set(Z_PREFIX_STR "brl_")
-  endif (TARGET ZLIB_BLD)

  ExternalProject_Add(OPENIMAGEIO_BLD
    URL "${CMAKE_CURRENT_SOURCE_DIR}/oiio"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/oiio.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-    -DBOOST_ROOT=$<$<BOOL:${BOOST_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DFMT_ROOT=$<$<BOOL:${FMT_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DJPEG_ROOT=$<$<BOOL:${JPEG_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DOPENEXR_ROOT=$<$<BOOL:${OPENEXR_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DOpenColorIO_ROOT=$<$<BOOL:${OPENCOLORIO_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DPNG_ROOT=$<$<BOOL:${PNG_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DTIFF_ROOT=$<$<BOOL:${TIFF_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${BOOST_TARGET}>:-DBoost_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${FMT_TARGET}>:-Dfmt_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${JPEG_TARGET}>:-DJPEG_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${OPENCOLORIO_TARGET}>:-DOpenColorIO_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${OPENEXR_TARGET}>:-DOpenEXR_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${PNG_TARGET}>:-DPNG_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${TIFF_TARGET}>:-Dtiff_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ZLIB_TARGET}>:-DZLIB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DINTERNALIZE_FMT=OFF
    -DBUILD_DOCS=OFF
    -DOIIO_BUILD_TESTS=OFF
@@ -16,6 +16,7 @@ if (ENABLE_OPENMESH)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/openmesh.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
@@ -10,9 +10,6 @@ if (ENABLE_OPENNURBS)
  git_submodule_init(opennurbs opennurbs.h)

  RegisterDeps(OPENNURBS)
-  if (TARGET ZLIB_BLD)
-    set(Z_PREFIX_STR "brl_")
-  endif (TARGET ZLIB_BLD)

  ExternalProject_Add(OPENNURBS_BLD
    URL "${CMAKE_CURRENT_SOURCE_DIR}/opennurbs"
@@ -44,9 +41,8 @@ if (ENABLE_OPENNURBS)
    COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/opennurbs_3dm_attributes.patch
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-    -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
+    $<$<BOOL:${ZLIB_TARGET}>:-DZLIB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
@@ -1,132 +1,3 @@
-diff -Naur opennurbs/CMake/FindZLIB.cmake openNURBS/CMake/FindZLIB.cmake
--- opennurbs/CMake/FindZLIB.cmake	1969-12-31 19:00:00.000000000 -0500
-+++ openNURBS/CMake/FindZLIB.cmake	2023-09-09 14:43:08.576725794 -0400
-@@ -0,0 +1,123 @@
-+#.rst:
-+# FindZLIB
-+# --------
-+#
-+# Find the native ZLIB includes and library.
-+#
-+# IMPORTED Targets
-+# ^^^^^^^^^^^^^^^^
-+#
-+# This module defines :prop_tgt:`IMPORTED` target ``ZLIB::ZLIB``, if
-+# ZLIB has been found.
-+#
-+# Result Variables
-+# ^^^^^^^^^^^^^^^^
-+#
-+# This module defines the following variables:
-+#
-+# ::
-+#
-+#   ZLIB_INCLUDE_DIRS   - where to find zlib.h, etc.
-+#   ZLIB_LIBRARIES      - List of libraries when using zlib.
-+#   ZLIB_FOUND          - True if zlib found.
-+#
-+# ::
-+#
-+#   ZLIB_VERSION_STRING - The version of zlib found (x.y.z)
-+#   ZLIB_VERSION_MAJOR  - The major version of zlib
-+#   ZLIB_VERSION_MINOR  - The minor version of zlib
-+#   ZLIB_VERSION_PATCH  - The patch version of zlib
-+#   ZLIB_VERSION_TWEAK  - The tweak version of zlib
-+#
-+# Backward Compatibility
-+# ^^^^^^^^^^^^^^^^^^^^^^
-+#
-+# The following variable are provided for backward compatibility
-+#
-+# ::
-+#
-+#   ZLIB_MAJOR_VERSION  - The major version of zlib
-+#   ZLIB_MINOR_VERSION  - The minor version of zlib
-+#   ZLIB_PATCH_VERSION  - The patch version of zlib
-+#
-+# Hints
-+# ^^^^^
-+#
-+# A user may set ``ZLIB_ROOT`` to a zlib installation root to tell this
-+# module where to look.
-+
-+#=============================================================================
-+# Copyright 2001-2011 Kitware, Inc.
-+#
-+# Distributed under the OSI-approved BSD License (the "License");
-+# see accompanying file Copyright.txt for details.
-+#
-+# This software is distributed WITHOUT ANY WARRANTY; without even the
-+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+# See the License for more information.
-+#=============================================================================
-+# (To distribute this file outside of CMake, substitute the full
-+#  License text for the above reference.)
-+
-+set(_ZLIB_SEARCHES)
-+
-+# Search ZLIB_ROOT first if it is set.
-+if(ZLIB_ROOT)
-+  set(_ZLIB_SEARCH_ROOT PATHS ${ZLIB_ROOT} NO_DEFAULT_PATH)
-+  list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_ROOT)
-+endif()
-+
-+# Normal search.
-+set(_ZLIB_SEARCH_NORMAL
-+  PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]"
-+        "$ENV{PROGRAMFILES}/zlib"
-+  )
-+list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_NORMAL)
-+
-+set(ZLIB_NAMES z_brl z zlib zdll zlib1 zlibd zlibd1)
-+
-+# Try each search configuration.
-+foreach(search ${_ZLIB_SEARCHES})
-+  find_path(ZLIB_INCLUDE_DIR NAMES zlib.h        ${${search}} PATH_SUFFIXES include)
-+  find_library(ZLIB_LIBRARY  NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib)
-+endforeach()
-+
-+mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
-+
-+if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
-+    file(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$")
-+
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"([0-9]+).*$" "\\1" ZLIB_VERSION_MAJOR "${ZLIB_H}")
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_MINOR  "${ZLIB_H}")
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_PATCH "${ZLIB_H}")
-+    set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH}")
-+
-+    # only append a TWEAK version if it exists:
-+    set(ZLIB_VERSION_TWEAK "")
-+    if( "${ZLIB_H}" MATCHES "ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+)")
-+        set(ZLIB_VERSION_TWEAK "${CMAKE_MATCH_1}")
-+        set(ZLIB_VERSION_STRING "${ZLIB_VERSION_STRING}.${ZLIB_VERSION_TWEAK}")
-+    endif()
-+
-+    set(ZLIB_MAJOR_VERSION "${ZLIB_VERSION_MAJOR}")
-+    set(ZLIB_MINOR_VERSION "${ZLIB_VERSION_MINOR}")
-+    set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}")
-+endif()
-+
-+# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
-+# all listed variables are TRUE
-+include(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB REQUIRED_VARS ZLIB_LIBRARY ZLIB_INCLUDE_DIR
-+                                       VERSION_VAR ZLIB_VERSION_STRING)
-+
-+if(ZLIB_FOUND)
-+    set(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
-+    set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
-+
-+    if(NOT TARGET ZLIB::ZLIB)
-+      add_library(ZLIB::ZLIB UNKNOWN IMPORTED)
-+      set_target_properties(ZLIB::ZLIB PROPERTIES
-+        IMPORTED_LOCATION "${ZLIB_LIBRARY}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
-+    endif()
-+endif()
-
-
 --- opennurbs/CMakeLists.txt	2024-07-13 00:43:41.388860103 -0400
 +++ OPENNURBS_BLD/CMakeLists.txt	2024-07-13 00:44:17.319201520 -0400
@@ -2,15 +2,54 @@
@@ -271,7 +142,7 @@ diff -Naur opennurbs/CMake/FindZLIB.cmake openNURBS/CMake/FindZLIB.cmake
 +endif(HAVE_SYS_STAT_H)
 +
 +find_package(ZLIB REQUIRED)
-+set(OPENNURBS_LINKLIBRARIES ${ZLIB_LIBRARIES})
+set(OPENNURBS_LINKLIBRARIES ZLIB::ZLIB)
 +
 +if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
 +  include(CheckCXXCompilerFlag)
@@ -6,9 +6,6 @@ if (ENABLE_OSL)
  git_submodule_init(OpenShadingLanguage CMakeLists.txt)

  RegisterDeps(OSL)
-  if (TARGET ZLIB_BLD)
-    set(Z_PREFIX_STR "brl_")
-  endif (TARGET ZLIB_BLD)

  # On Windows it's both or nothing...
  if (MSVC AND FLEX_TARGET)
@@ -20,16 +17,15 @@ if (ENABLE_OSL)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/osl.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-    -DBoost_ROOT=$<$<BOOL:${BOOST_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DBISON_ROOT=$<$<BOOL:${BISON_TARGET}>:${CMAKE_NOBUNDLE_INSTALL_PREFIX}>
-    -DFLEX_ROOT=$<$<BOOL:${FLEX_TARGET}>:${CMAKE_NOBUNDLE_INSTALL_PREFIX}>
-    -DLLVM_ROOT=$<$<BOOL:${LLVM_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DOpenImageIO_ROOT=$<$<BOOL:${OPENIMAGEIO_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DPUGIXML_ROOT=$<$<BOOL:${PUGIXML_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${BISON_TARGET}>:-DBISON_ROOT=${CMAKE_NOBUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${BOOST_TARGET}>:-DBoost_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${FLEX_TARGET}>:-DFLEX_ROOT=${CMAKE_NOBUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${LLVM_TARGET}>:-DLLVM_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${OPENIMAGEIO_TARGET}>:-DOpenImageIO_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${PUGIXML_TARGET}>:-Dpugixmu_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ZLIB_TARGET}>:-DZLIB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DOSL_BUILD_TESTS=OFF
    -DOSL_BUILD_SHADERS=OFF
    -DUSE_PYTHON=OFF
@@ -15,6 +15,7 @@ if (ENABLE_OSMESA)
    URL "${CMAKE_CURRENT_SOURCE_DIR}/osmesa"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DOSMESA_BUILD_EXAMPLES=OFF
    ${BUILD_TYPE_SPECIFIER}
    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -12,10 +12,11 @@ if (ENABLE_OSPRAY)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    #PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/ospray.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
-    -DEMBREE_ROOT=$<$<BOOL:${EMBREE_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DISPC_ROOT=$<$<BOOL:${ISPC_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DTBB_ROOT=$<$<BOOL:${TBB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${EMBREE_TARGET}>:-DEMBREE_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ISPC_TARGET}>:-DISPC_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${TBB_TARGET}>:-DTBB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DOSPRAY_ENABLE_VOLUMES=OFF
    -DOSPRAY_ENABLE_APPS_BENCHMARK=OFF
    -DOSPRAY_ENABLE_APPS_TESTING=OFF
@@ -36,6 +36,7 @@ if (ENABLE_PATCH)
    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/patch"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
@@ -29,6 +29,7 @@ if (NOT MSVC AND NOT APPLE)
      SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/patchelf"
      BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
      CMAKE_ARGS
+      -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
      $<$<NOT:$<BOOL:${CMAKE_CONFIGURATION_TYPES}>>:-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}>
      -DBIN_DIR=${BIN_DIR}
      -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
@@ -15,9 +15,10 @@ if (ENABLE_PERPLEX)
    URL "${CMAKE_CURRENT_SOURCE_DIR}/perplex"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
-    -DLEMON_ROOT=$<$<BOOL:${LEMON_TARGET}>:${CMAKE_NOBUNDLE_INSTALL_PREFIX}>
-    -DRE2C_ROOT=$<$<BOOL:${RE2C_TARGET}>:${CMAKE_NOBUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${LEMON_TARGET}>:-DLEMON_ROOT=${CMAKE_NOBUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${RE2C_TARGET}>:-DRE2C_ROOT=${CMAKE_NOBUNDLE_INSTALL_PREFIX}>
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
    -DDATA_DIR=${DATA_DIR}
@@ -31,8 +31,9 @@ if (NOT MSVC AND NOT APPLE)
      URL "${CMAKE_CURRENT_SOURCE_DIR}/plief"
      BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
      CMAKE_ARGS
+      -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
      ${BUILD_TYPE_SPECIFIER}
-      -DLIEF_ROOT=$<$<BOOL:${LEMON_TARGET}>:${CMAKE_NOBUNDLE_INSTALL_PREFIX}>
+      $<$<BOOL:${LEMON_TARGET}>:-DLIEF_ROOT=${CMAKE_NOBUNDLE_INSTALL_PREFIX}>
      -DBIN_DIR=${BIN_DIR}
      -DLIB_DIR=${LIB_DIR}
      -DDATA_DIR=${DATA_DIR}
@@ -30,12 +30,12 @@ if (ENABLE_PNG)
  ExternalProject_Add(PNG_BLD
    URL "${CMAKE_CURRENT_SOURCE_DIR}/libpng"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
-    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/png.patch
+    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/png_cmake.patch
+    COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/png_zlib.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-    -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ZLIB_TARGET}>:-DZLIB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DPNG_LIB_NAME=${PNG_LIB_NAME}
    -DPNG_NO_DEBUG_POSTFIX=ON
    -DPNG_PREFIX=brl_
@@ -1,215 +0,0 @@
-diff -Naur libpng/CMake/FindZLIB.cmake PNG_BLD/CMake/FindZLIB.cmake
--- libpng/CMake/FindZLIB.cmake	1969-12-31 19:00:00.000000000 -0500
-+++ PNG_BLD/CMake/FindZLIB.cmake	2024-03-06 10:42:37.366757148 -0500
-@@ -0,0 +1,123 @@
-+#.rst:
-+# FindZLIB
-+# --------
-+#
-+# Find the native ZLIB includes and library.
-+#
-+# IMPORTED Targets
-+# ^^^^^^^^^^^^^^^^
-+#
-+# This module defines :prop_tgt:`IMPORTED` target ``ZLIB::ZLIB``, if
-+# ZLIB has been found.
-+#
-+# Result Variables
-+# ^^^^^^^^^^^^^^^^
-+#
-+# This module defines the following variables:
-+#
-+# ::
-+#
-+#   ZLIB_INCLUDE_DIRS   - where to find zlib.h, etc.
-+#   ZLIB_LIBRARIES      - List of libraries when using zlib.
-+#   ZLIB_FOUND          - True if zlib found.
-+#
-+# ::
-+#
-+#   ZLIB_VERSION_STRING - The version of zlib found (x.y.z)
-+#   ZLIB_VERSION_MAJOR  - The major version of zlib
-+#   ZLIB_VERSION_MINOR  - The minor version of zlib
-+#   ZLIB_VERSION_PATCH  - The patch version of zlib
-+#   ZLIB_VERSION_TWEAK  - The tweak version of zlib
-+#
-+# Backward Compatibility
-+# ^^^^^^^^^^^^^^^^^^^^^^
-+#
-+# The following variable are provided for backward compatibility
-+#
-+# ::
-+#
-+#   ZLIB_MAJOR_VERSION  - The major version of zlib
-+#   ZLIB_MINOR_VERSION  - The minor version of zlib
-+#   ZLIB_PATCH_VERSION  - The patch version of zlib
-+#
-+# Hints
-+# ^^^^^
-+#
-+# A user may set ``ZLIB_ROOT`` to a zlib installation root to tell this
-+# module where to look.
-+
-+#=============================================================================
-+# Copyright 2001-2011 Kitware, Inc.
-+#
-+# Distributed under the OSI-approved BSD License (the "License");
-+# see accompanying file Copyright.txt for details.
-+#
-+# This software is distributed WITHOUT ANY WARRANTY; without even the
-+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+# See the License for more information.
-+#=============================================================================
-+# (To distribute this file outside of CMake, substitute the full
-+#  License text for the above reference.)
-+
-+set(_ZLIB_SEARCHES)
-+
-+# Search ZLIB_ROOT first if it is set.
-+if(ZLIB_ROOT)
-+  set(_ZLIB_SEARCH_ROOT PATHS ${ZLIB_ROOT} NO_DEFAULT_PATH)
-+  list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_ROOT)
-+endif()
-+
-+# Normal search.
-+set(_ZLIB_SEARCH_NORMAL
-+  PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]"
-+        "$ENV{PROGRAMFILES}/zlib"
-+  )
-+list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_NORMAL)
-+
-+set(ZLIB_NAMES z_brl z zlib zdll zlib1 zlibd zlibd1)
-+
-+# Try each search configuration.
-+foreach(search ${_ZLIB_SEARCHES})
-+  find_path(ZLIB_INCLUDE_DIR NAMES zlib.h        ${${search}} PATH_SUFFIXES include)
-+  find_library(ZLIB_LIBRARY  NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib)
-+endforeach()
-+
-+mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
-+
-+if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
-+    file(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$")
-+
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"([0-9]+).*$" "\\1" ZLIB_VERSION_MAJOR "${ZLIB_H}")
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_MINOR  "${ZLIB_H}")
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_PATCH "${ZLIB_H}")
-+    set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH}")
-+
-+    # only append a TWEAK version if it exists:
-+    set(ZLIB_VERSION_TWEAK "")
-+    if( "${ZLIB_H}" MATCHES "ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+)")
-+        set(ZLIB_VERSION_TWEAK "${CMAKE_MATCH_1}")
-+        set(ZLIB_VERSION_STRING "${ZLIB_VERSION_STRING}.${ZLIB_VERSION_TWEAK}")
-+    endif()
-+
-+    set(ZLIB_MAJOR_VERSION "${ZLIB_VERSION_MAJOR}")
-+    set(ZLIB_MINOR_VERSION "${ZLIB_VERSION_MINOR}")
-+    set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}")
-+endif()
-+
-+# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
-+# all listed variables are TRUE
-+include(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB REQUIRED_VARS ZLIB_LIBRARY ZLIB_INCLUDE_DIR
-+                                       VERSION_VAR ZLIB_VERSION_STRING)
-+
-+if(ZLIB_FOUND)
-+    set(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
-+    set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
-+
-+    if(NOT TARGET ZLIB::ZLIB)
-+      add_library(ZLIB::ZLIB UNKNOWN IMPORTED)
-+      set_target_properties(ZLIB::ZLIB PROPERTIES
-+        IMPORTED_LOCATION "${ZLIB_LIBRARY}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
-+    endif()
-+endif()
-diff -Naur libpng/CMakeLists.txt PNG_BLD/CMakeLists.txt
--- libpng/CMakeLists.txt	2024-03-06 10:43:33.593760600 -0500
-+++ PNG_BLD/CMakeLists.txt	2024-03-06 10:51:59.356989438 -0500
-@@ -30,6 +30,9 @@
-         VERSION ${PNGLIB_VERSION}
-         LANGUAGES C ASM)
- 
-+# Location of CMake modules
-+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
-+
- if(POLICY CMP0074)
-   # Allow find_package() to use the ZLIB_ROOT variable, if available.
-   cmake_policy(SET CMP0074 NEW)
-@@ -47,8 +50,10 @@
- # Previously, we used to set CMAKE_DEBUG_POSTFIX globally. That variable should
- # not be cached, however, because doing so would affect all projects processed
- # after libpng, in unexpected and undesirable ways.
-set(PNG_DEBUG_POSTFIX "d"
-    CACHE STRING "Postfix to append to library file names under the Debug configuration")
-+if(NOT PNG_NO_DEBUG_POSTFIX)
-+  set(PNG_DEBUG_POSTFIX "d"
-+      CACHE STRING "Postfix to append to library file names under the Debug configuration")
-+endif(NOT PNG_NO_DEBUG_POSTFIX)
- 
- # Allow the users to import their own extra configuration settings.
- set(DFA_XTRA ""
-@@ -97,6 +102,7 @@
- option(PNG_BUILD_ZLIB "Custom zlib location, else find_package is used" OFF)
- if(NOT PNG_BUILD_ZLIB)
-   find_package(ZLIB REQUIRED)
-+  include_directories(${ZLIB_INCLUDE_DIRS})
- elseif(POLICY CMP0074)
-   if("x${ZLIB_ROOT}" STREQUAL "x")
-     message(DEPRECATION
-@@ -489,10 +495,9 @@
- 
-   if(PNG_PREFIX)
-     set(PNGLIBCONF_H_EXTRA_DEPENDS
-        "${CMAKE_CURRENT_BINARY_DIR}/scripts/prefix.out"
-        "${CMAKE_CURRENT_SOURCE_DIR}/scripts/macro.lst")
-+        png_scripts_prefix_out)
-     set(PNGPREFIX_H_EXTRA_DEPENDS
-        "${CMAKE_CURRENT_BINARY_DIR}/scripts/intprefix.out")
-+        png_scripts_intprefix_out)
-   endif()
- 
-   generate_out(INPUT "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.c"
-@@ -676,15 +681,15 @@
-   # We are on a Unix or Unix-like toolchain like the GNU toolchain on Windows.
-   # Library file names are expected to have an implicit prefix such as "lib".
-   # Let CMake prepend and append its usual prefixes and suffixes by default.
-  set(PNG_SHARED_OUTPUT_NAME "png${PNGLIB_ABI_VERSION}")
-  set(PNG_STATIC_OUTPUT_NAME "png${PNGLIB_ABI_VERSION}")
-+  set(PNG_SHARED_OUTPUT_NAME "png_brl${PNGLIB_ABI_VERSION}")
-+  set(PNG_STATIC_OUTPUT_NAME "png_brl${PNGLIB_ABI_VERSION}")
- else()
-   # We are, most likely, on a Windows toolchain like MSVC, Clang on Windows,
-   # Borland/Embarcadero, etc. We need to specify the "libpng" name explicitly.
-   # We also need to use a custom suffix, in order to distinguish between the
-   # shared import library name and the static library name.
-  set(PNG_SHARED_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}")
-  set(PNG_STATIC_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}_static")
-+  set(PNG_SHARED_OUTPUT_NAME "libpng_brl${PNGLIB_ABI_VERSION}")
-+  set(PNG_STATIC_OUTPUT_NAME "libpng_brl${PNGLIB_ABI_VERSION}_static")
- endif()
- 
- if(PNG_SHARED)
-@@ -1067,16 +1072,16 @@
-   if(PNG_SHARED)
-     # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin
-     if(NOT WIN32 OR CYGWIN OR MINGW)
-      create_symlink(libpng${CMAKE_SHARED_LIBRARY_SUFFIX} TARGET png_shared)
-      install(FILES $<TARGET_LINKER_FILE_DIR:png_shared>/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
-+      create_symlink(libpng_brl${CMAKE_SHARED_LIBRARY_SUFFIX} TARGET png_shared)
-+      install(FILES $<TARGET_LINKER_FILE_DIR:png_shared>/libpng_brl${CMAKE_SHARED_LIBRARY_SUFFIX}
-               DESTINATION ${CMAKE_INSTALL_LIBDIR})
-     endif()
-   endif()
- 
-   if(PNG_STATIC)
-     if(NOT WIN32 OR CYGWIN OR MINGW)
-      create_symlink(libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)
-      install(FILES $<TARGET_LINKER_FILE_DIR:png_static>/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
-+      create_symlink(libpng_brl${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)
-+      install(FILES $<TARGET_LINKER_FILE_DIR:png_static>/libpng_brl${CMAKE_STATIC_LIBRARY_SUFFIX}
-               DESTINATION ${CMAKE_INSTALL_LIBDIR})
-     endif()
-   endif()
@@ -0,0 +1,70 @@
+diff -Naur libpng/CMakeLists.txt PNG_BLD/CMakeLists.txt
+--- libpng/CMakeLists.txt	2024-10-11 10:39:06.421433191 -0400
+++ PNG_BLD/CMakeLists.txt	2024-10-11 10:40:45.921699021 -0400
+@@ -47,8 +47,10 @@
+ # Previously, we used to set CMAKE_DEBUG_POSTFIX globally. That variable should
+ # not be cached, however, because doing so would affect all projects processed
+ # after libpng, in unexpected and undesirable ways.
+-set(PNG_DEBUG_POSTFIX "d"
+-    CACHE STRING "Postfix to append to library file names under the Debug configuration")
+if(NOT PNG_NO_DEBUG_POSTFIX)
+  set(PNG_DEBUG_POSTFIX "d"
+      CACHE STRING "Postfix to append to library file names under the Debug configuration")
+endif(NOT PNG_NO_DEBUG_POSTFIX)
+ 
+ # Allow the users to import their own extra configuration settings.
+ set(DFA_XTRA ""
+@@ -488,10 +490,9 @@
+ 
+   if(PNG_PREFIX)
+     set(PNGLIBCONF_H_EXTRA_DEPENDS
+-        "${CMAKE_CURRENT_BINARY_DIR}/scripts/prefix.out"
+-        "${CMAKE_CURRENT_SOURCE_DIR}/scripts/macro.lst")
+        png_scripts_prefix_out)
+     set(PNGPREFIX_H_EXTRA_DEPENDS
+-        "${CMAKE_CURRENT_BINARY_DIR}/scripts/intprefix.out")
+        png_scripts_intprefix_out)
+   endif()
+ 
+   generate_out(INPUT "${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.c"
+@@ -675,15 +676,15 @@
+   # We are on a Unix or Unix-like toolchain like the GNU toolchain on Windows.
+   # Library file names are expected to have an implicit prefix such as "lib".
+   # Let CMake prepend and append its usual prefixes and suffixes by default.
+-  set(PNG_SHARED_OUTPUT_NAME "png${PNGLIB_ABI_VERSION}")
+-  set(PNG_STATIC_OUTPUT_NAME "png${PNGLIB_ABI_VERSION}")
+  set(PNG_SHARED_OUTPUT_NAME "png_brl${PNGLIB_ABI_VERSION}")
+  set(PNG_STATIC_OUTPUT_NAME "png_brl${PNGLIB_ABI_VERSION}")
+ else()
+   # We are, most likely, on a Windows toolchain like MSVC, Clang on Windows,
+   # Borland/Embarcadero, etc. We need to specify the "libpng" name explicitly.
+   # We also need to use a custom suffix, in order to distinguish between the
+   # shared import library name and the static library name.
+-  set(PNG_SHARED_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}")
+-  set(PNG_STATIC_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}_static")
+  set(PNG_SHARED_OUTPUT_NAME "libpng_brl${PNGLIB_ABI_VERSION}")
+  set(PNG_STATIC_OUTPUT_NAME "libpng_brl${PNGLIB_ABI_VERSION}_static")
+ endif()
+ 
+ if(PNG_SHARED)
+@@ -1072,16 +1073,16 @@
+   if(PNG_SHARED)
+     # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin
+     if(NOT WIN32 OR CYGWIN OR MINGW)
+-      create_symlink(libpng${CMAKE_SHARED_LIBRARY_SUFFIX} TARGET png_shared)
+-      install(FILES $<TARGET_LINKER_FILE_DIR:png_shared>/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
+      create_symlink(libpng_brl${CMAKE_SHARED_LIBRARY_SUFFIX} TARGET png_shared)
+      install(FILES $<TARGET_LINKER_FILE_DIR:png_shared>/libpng_brl${CMAKE_SHARED_LIBRARY_SUFFIX}
+               DESTINATION ${CMAKE_INSTALL_LIBDIR})
+     endif()
+   endif()
+ 
+   if(PNG_STATIC)
+     if(NOT WIN32 OR CYGWIN OR MINGW)
+-      create_symlink(libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)
+-      install(FILES $<TARGET_LINKER_FILE_DIR:png_static>/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
+      create_symlink(libpng_brl${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)
+      install(FILES $<TARGET_LINKER_FILE_DIR:png_static>/libpng_brl${CMAKE_STATIC_LIBRARY_SUFFIX}
+               DESTINATION ${CMAKE_INSTALL_LIBDIR})
+     endif()
+   endif()
@@ -0,0 +1,12 @@
+diff -Naur libpng/scripts/pnglibconf.dfa PNG_BLD/scripts/pnglibconf.dfa
+--- libpng/scripts/pnglibconf.dfa	2024-10-11 10:48:58.913083752 -0400
+++ PNG_BLD/scripts/pnglibconf.dfa	2024-10-11 10:48:27.026205664 -0400
+@@ -343,7 +343,7 @@
+ # The TEXT values are the defaults when writing compressed text (all forms)
+ 
+ # Include the zlib header so that the defaults below are known
+-@#  include <zlib.h>
+@#  include "zlib.h"
+ 
+ # The '@' here means to substitute the value when pnglibconf.h is built
+ setting Z_DEFAULT_COMPRESSION default @Z_DEFAULT_COMPRESSION
@@ -29,6 +29,7 @@ if (ENABLE_POISSONRECON)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/poissonrecon.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DCMAKE_INSTALL_PREFIX=${CMAKE_NOBUNDLE_INSTALL_PREFIX}
    LOG_CONFIGURE ${EXT_BUILD_QUIET}
@@ -14,8 +14,9 @@ if (ENABLE_PROJ)
  ExternalProject_Add(PROJ_BLD
    URL "${CMAKE_CURRENT_SOURCE_DIR}/PROJ"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
-    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/proj.patch
+    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/proj_cmake.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
@@ -26,7 +27,7 @@ if (ENABLE_PROJ)
    -DCMAKE_INSTALL_LIBDIR:PATH=${LIB_DIR}
    -DCMAKE_INSTALL_RPATH=${CMAKE_BUNDLE_INSTALL_PREFIX}/${LIB_DIR}
    -DPROJ_LIB_DIR=${CMAKE_BUNDLE_INSTALL_PREFIX}/${DATA_DIR}/proj
-    -DSQLite3_ROOT=$<$<BOOL:${SQLITE3_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${SQLITE3_TARGET}>:-DSQLite3_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DBUILD_TESTING=OFF
    -DENABLE_TIFF=OFF
    -DENABLE_CURL=OFF
@@ -16,6 +16,7 @@ if (ENABLE_PUGIXML)
    URL "${CMAKE_CURRENT_SOURCE_DIR}/pugixml"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
@@ -12,6 +12,7 @@ if (ENABLE_PYSTRING)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/pystring.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
@@ -55,10 +55,9 @@ if (ENABLE_QT)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/qtsvg.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-    -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ZLIB_TARGET}>:-DZLIB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DQt6_DIR=${CMAKE_BUNDLE_INSTALL_PREFIX}/${LIB_DIR}/cmake/Qt6
    -DQt6_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}
    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -1,2 +1,2 @@
 PATCH
-
+ZLIB
@@ -1,138 +1,11 @@
-diff -Naur qtsvg/CMake/FindZLIB.cmake Qt6Svg_BLD/CMake/FindZLIB.cmake
--- qtsvg/CMake/FindZLIB.cmake	1969-12-31 19:00:00.000000000 -0500
-+++ Qt6Svg_BLD/CMake/FindZLIB.cmake	2023-12-20 10:19:52.104033439 -0500
-@@ -0,0 +1,123 @@
-+#.rst:
-+# FindZLIB
-+# --------
-+#
-+# Find the native ZLIB includes and library.
-+#
-+# IMPORTED Targets
-+# ^^^^^^^^^^^^^^^^
-+#
-+# This module defines :prop_tgt:`IMPORTED` target ``ZLIB::ZLIB``, if
-+# ZLIB has been found.
-+#
-+# Result Variables
-+# ^^^^^^^^^^^^^^^^
-+#
-+# This module defines the following variables:
-+#
-+# ::
-+#
-+#   ZLIB_INCLUDE_DIRS   - where to find zlib.h, etc.
-+#   ZLIB_LIBRARIES      - List of libraries when using zlib.
-+#   ZLIB_FOUND          - True if zlib found.
-+#
-+# ::
-+#
-+#   ZLIB_VERSION_STRING - The version of zlib found (x.y.z)
-+#   ZLIB_VERSION_MAJOR  - The major version of zlib
-+#   ZLIB_VERSION_MINOR  - The minor version of zlib
-+#   ZLIB_VERSION_PATCH  - The patch version of zlib
-+#   ZLIB_VERSION_TWEAK  - The tweak version of zlib
-+#
-+# Backward Compatibility
-+# ^^^^^^^^^^^^^^^^^^^^^^
-+#
-+# The following variable are provided for backward compatibility
-+#
-+# ::
-+#
-+#   ZLIB_MAJOR_VERSION  - The major version of zlib
-+#   ZLIB_MINOR_VERSION  - The minor version of zlib
-+#   ZLIB_PATCH_VERSION  - The patch version of zlib
-+#
-+# Hints
-+# ^^^^^
-+#
-+# A user may set ``ZLIB_ROOT`` to a zlib installation root to tell this
-+# module where to look.
-+
-+#=============================================================================
-+# Copyright 2001-2011 Kitware, Inc.
-+#
-+# Distributed under the OSI-approved BSD License (the "License");
-+# see accompanying file Copyright.txt for details.
-+#
-+# This software is distributed WITHOUT ANY WARRANTY; without even the
-+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+# See the License for more information.
-+#=============================================================================
-+# (To distribute this file outside of CMake, substitute the full
-+#  License text for the above reference.)
-+
-+set(_ZLIB_SEARCHES)
-+
-+# Search ZLIB_ROOT first if it is set.
-+if(ZLIB_ROOT)
-+  set(_ZLIB_SEARCH_ROOT PATHS ${ZLIB_ROOT} NO_DEFAULT_PATH)
-+  list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_ROOT)
-+endif()
-+
-+# Normal search.
-+set(_ZLIB_SEARCH_NORMAL
-+  PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]"
-+        "$ENV{PROGRAMFILES}/zlib"
-+  )
-+list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_NORMAL)
-+
-+set(ZLIB_NAMES z_brl z zlib zdll zlib1 zlibd zlibd1)
-+
-+# Try each search configuration.
-+foreach(search ${_ZLIB_SEARCHES})
-+  find_path(ZLIB_INCLUDE_DIR NAMES zlib.h        ${${search}} PATH_SUFFIXES include)
-+  find_library(ZLIB_LIBRARY  NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib)
-+endforeach()
-+
-+mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
-+
-+if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
-+    file(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$")
-+
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"([0-9]+).*$" "\\1" ZLIB_VERSION_MAJOR "${ZLIB_H}")
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_MINOR  "${ZLIB_H}")
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_PATCH "${ZLIB_H}")
-+    set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH}")
-+
-+    # only append a TWEAK version if it exists:
-+    set(ZLIB_VERSION_TWEAK "")
-+    if( "${ZLIB_H}" MATCHES "ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+)")
-+        set(ZLIB_VERSION_TWEAK "${CMAKE_MATCH_1}")
-+        set(ZLIB_VERSION_STRING "${ZLIB_VERSION_STRING}.${ZLIB_VERSION_TWEAK}")
-+    endif()
-+
-+    set(ZLIB_MAJOR_VERSION "${ZLIB_VERSION_MAJOR}")
-+    set(ZLIB_MINOR_VERSION "${ZLIB_VERSION_MINOR}")
-+    set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}")
-+endif()
-+
-+# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
-+# all listed variables are TRUE
-+include(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB REQUIRED_VARS ZLIB_LIBRARY ZLIB_INCLUDE_DIR
-+                                       VERSION_VAR ZLIB_VERSION_STRING)
-+
-+if(ZLIB_FOUND)
-+    set(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
-+    set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
-+
-+    if(NOT TARGET ZLIB::ZLIB)
-+      add_library(ZLIB::ZLIB UNKNOWN IMPORTED)
-+      set_target_properties(ZLIB::ZLIB PROPERTIES
-+        IMPORTED_LOCATION "${ZLIB_LIBRARY}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
-+    endif()
-+endif()
 diff -Naur qtsvg/CMakeLists.txt Qt6Svg_BLD/CMakeLists.txt
--- qtsvg/CMakeLists.txt	2023-12-19 20:56:21.873344047 -0500
-+++ Qt6Svg_BLD/CMakeLists.txt	2023-12-20 10:28:48.591993474 -0500
+--- qtsvg/CMakeLists.txt	2024-10-11 13:57:45.155801129 -0400
+++ Qt6Svg_BLD/CMakeLists.txt	2024-10-11 13:58:46.928924859 -0400
@@ -11,6 +11,8 @@
     LANGUAGES CXX C
 )
 
-+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
+find_package(ZLIB REQUIRED)
 +
 find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core)
 find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Widgets Xml)
@@ -158,22 +31,13 @@ diff -Naur qtsvg/CMakeLists.txt Qt6Svg_BLD/CMakeLists.txt
 +
 qt_build_repo()
 diff -Naur qtsvg/src/svg/CMakeLists.txt Qt6Svg_BLD/src/svg/CMakeLists.txt
--- qtsvg/src/svg/CMakeLists.txt	2023-12-19 20:56:21.877344964 -0500
-+++ Qt6Svg_BLD/src/svg/CMakeLists.txt	2023-12-20 10:19:52.104033439 -0500
-@@ -12,6 +12,8 @@
-     qt_find_package(WrapZLIB PROVIDED_TARGETS WrapZLIB::WrapZLIB)
- endif()
- 
-+find_package(ZLIB)
-+
- qt_internal_add_module(Svg
-     SOURCES
-         qsvgfont.cpp qsvgfont_p.h
-@@ -32,6 +34,7 @@
+--- qtsvg/src/svg/CMakeLists.txt	2024-10-11 13:57:45.158801086 -0400
+++ Qt6Svg_BLD/src/svg/CMakeLists.txt	2024-10-11 13:59:36.937211035 -0400
+@@ -37,6 +37,7 @@
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
-+        ${ZLIB_LIBRARY}
+        ZLIB::ZLIB
     PRIVATE_MODULE_INTERFACE
         Qt::CorePrivate
         Qt::GuiPrivate
@@ -16,6 +16,7 @@ if (ENABLE_RE2C)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/re2c.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DRE2C_BUILD_RE2GO=OFF
    -DRE2C_BUILD_RE2RUST=OFF
@@ -20,6 +20,7 @@ if (ENABLE_REGEX)
    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/regex"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
@@ -12,8 +12,9 @@ if (ENABLE_RKCOMMON)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    #PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/rkcommon.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
-    -DTBB_ROOT=$<$<BOOL:${ONETBB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ONETBB_TARGET}>:-DTBB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
    -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
@@ -27,6 +27,7 @@ if (ENABLE_SQLite3)
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/sqlite3.patch
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
    -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
@@ -19,6 +19,7 @@ if (ENABLE_STEPCODE)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
    -DBUILD_STATIC_LIBS=OFF
@@ -27,6 +27,7 @@ if (ENABLE_STRCLEAR)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
    -DDATA_DIR=${DATA_DIR}
@@ -11,19 +11,15 @@ if (ENABLE_TIFF)
  git_submodule_init(libtiff CMakeLists.txt)

  RegisterDeps(TIFF)
-  if (TARGET ZLIB_BLD)
-    set(Z_PREFIX_STR "brl_")
-  endif (TARGET ZLIB_BLD)

  ExternalProject_Add(TIFF_BLD
    URL "${CMAKE_CURRENT_SOURCE_DIR}/libtiff"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
-    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/tiff.patch
+    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/tiff_cmake.patch
    CMAKE_ARGS
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
-    $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-    -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DJPEG_ROOT=$<$<BOOL:${JPEG_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
+    $<$<BOOL:${JPEG_TARGET}>:-DJPEG_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ZLIB_TARGET}>:-DZLIB_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -Djbig=OFF
    -Djpeg12=OFF
    -Djpeg=ON
@@ -1,191 +0,0 @@
-diff -Naur tiff-4.6.0/cmake/FindJPEG.cmake tiff/cmake/FindJPEG.cmake
--- tiff-4.6.0/cmake/FindJPEG.cmake	2023-09-13 11:45:24.706250236 -0400
-+++ tiff/cmake/FindJPEG.cmake	2023-09-13 12:08:36.942477725 -0400
-@@ -56,22 +56,33 @@
-   where to find the JPEG library.
- #]=======================================================================]
- 
-find_path(JPEG_INCLUDE_DIR jpeglib.h)
-+set(_JPEG_SEARCHES)
- 
-set(jpeg_names ${JPEG_NAMES} jpeg jpeg-static libjpeg libjpeg-static turbojpeg turbojpeg-static)
-foreach(name ${jpeg_names})
-  list(APPEND jpeg_names_debug "${name}d")
-+# Search JPEG_ROOT first if it is set.
-+if(JPEG_ROOT)
-+  set(_JPEG_SEARCH_ROOT PATHS ${JPEG_ROOT} NO_DEFAULT_PATH)
-+  list(APPEND _JPEG_SEARCHES _JPEG_SEARCH_ROOT)
-+endif()
-+
-+set(JPEG_NAMES ${JPEG_NAMES} jpeg jpeg-static libjpeg libjpeg-static)
-+foreach(name ${JPEG_NAMES})
-+  list(APPEND JPEG_NAMES_DEBUG "${name}d")
- endforeach()
- 
-if(NOT JPEG_LIBRARY)
-  find_library(JPEG_LIBRARY_RELEASE NAMES ${jpeg_names} NAMES_PER_DIR)
-  find_library(JPEG_LIBRARY_DEBUG NAMES ${jpeg_names_debug} NAMES_PER_DIR)
-+# Try each search configuration.
-+foreach(search ${_JPEG_SEARCHES})
-+	message("search: ${search}")
-+	message("JPEG_NAMES: ${JPEG_NAMES}")
-+  find_path(JPEG_INCLUDE_DIR NAMES jpeglib.h     ${${search}} PATH_SUFFIXES include)
-+  find_library(JPEG_LIBRARY_RELEASE NAMES ${JPEG_NAMES} ${${search}} PATH_SUFFIXES lib)
-+  find_library(JPEG_LIBRARY_DEBUG NAMES ${JPEG_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib)
-   include(SelectLibraryConfigurations)
-   select_library_configurations(JPEG)
-   mark_as_advanced(JPEG_LIBRARY_RELEASE JPEG_LIBRARY_DEBUG)
-endif()
-unset(jpeg_names)
-unset(jpeg_names_debug)
-+endforeach()
-+
-+unset(JPEG_NAMES)
-+unset(JPEG_NAMES_DEBUG)
- 
- if(JPEG_INCLUDE_DIR)
-   file(GLOB _JPEG_CONFIG_HEADERS_FEDORA "${JPEG_INCLUDE_DIR}/jconfig*.h")
-diff -Naur tiff-4.6.0/cmake/FindZLIB.cmake tiff/cmake/FindZLIB.cmake
--- tiff-4.6.0/cmake/FindZLIB.cmake	1969-12-31 19:00:00.000000000 -0500
-+++ tiff/cmake/FindZLIB.cmake	2023-09-13 11:45:46.449892320 -0400
-@@ -0,0 +1,123 @@
-+#.rst:
-+# FindZLIB
-+# --------
-+#
-+# Find the native ZLIB includes and library.
-+#
-+# IMPORTED Targets
-+# ^^^^^^^^^^^^^^^^
-+#
-+# This module defines :prop_tgt:`IMPORTED` target ``ZLIB::ZLIB``, if
-+# ZLIB has been found.
-+#
-+# Result Variables
-+# ^^^^^^^^^^^^^^^^
-+#
-+# This module defines the following variables:
-+#
-+# ::
-+#
-+#   ZLIB_INCLUDE_DIRS   - where to find zlib.h, etc.
-+#   ZLIB_LIBRARIES      - List of libraries when using zlib.
-+#   ZLIB_FOUND          - True if zlib found.
-+#
-+# ::
-+#
-+#   ZLIB_VERSION_STRING - The version of zlib found (x.y.z)
-+#   ZLIB_VERSION_MAJOR  - The major version of zlib
-+#   ZLIB_VERSION_MINOR  - The minor version of zlib
-+#   ZLIB_VERSION_PATCH  - The patch version of zlib
-+#   ZLIB_VERSION_TWEAK  - The tweak version of zlib
-+#
-+# Backward Compatibility
-+# ^^^^^^^^^^^^^^^^^^^^^^
-+#
-+# The following variable are provided for backward compatibility
-+#
-+# ::
-+#
-+#   ZLIB_MAJOR_VERSION  - The major version of zlib
-+#   ZLIB_MINOR_VERSION  - The minor version of zlib
-+#   ZLIB_PATCH_VERSION  - The patch version of zlib
-+#
-+# Hints
-+# ^^^^^
-+#
-+# A user may set ``ZLIB_ROOT`` to a zlib installation root to tell this
-+# module where to look.
-+
-+#=============================================================================
-+# Copyright 2001-2011 Kitware, Inc.
-+#
-+# Distributed under the OSI-approved BSD License (the "License");
-+# see accompanying file Copyright.txt for details.
-+#
-+# This software is distributed WITHOUT ANY WARRANTY; without even the
-+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+# See the License for more information.
-+#=============================================================================
-+# (To distribute this file outside of CMake, substitute the full
-+#  License text for the above reference.)
-+
-+set(_ZLIB_SEARCHES)
-+
-+# Search ZLIB_ROOT first if it is set.
-+if(ZLIB_ROOT)
-+  set(_ZLIB_SEARCH_ROOT PATHS ${ZLIB_ROOT} NO_DEFAULT_PATH)
-+  list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_ROOT)
-+endif()
-+
-+# Normal search.
-+set(_ZLIB_SEARCH_NORMAL
-+  PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]"
-+        "$ENV{PROGRAMFILES}/zlib"
-+  )
-+list(APPEND _ZLIB_SEARCHES _ZLIB_SEARCH_NORMAL)
-+
-+set(ZLIB_NAMES z_brl z zlib zdll zlib1 zlibd zlibd1)
-+
-+# Try each search configuration.
-+foreach(search ${_ZLIB_SEARCHES})
-+  find_path(ZLIB_INCLUDE_DIR NAMES zlib.h        ${${search}} PATH_SUFFIXES include)
-+  find_library(ZLIB_LIBRARY  NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib)
-+endforeach()
-+
-+mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
-+
-+if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
-+    file(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$")
-+
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"([0-9]+).*$" "\\1" ZLIB_VERSION_MAJOR "${ZLIB_H}")
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_MINOR  "${ZLIB_H}")
-+    string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_PATCH "${ZLIB_H}")
-+    set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH}")
-+
-+    # only append a TWEAK version if it exists:
-+    set(ZLIB_VERSION_TWEAK "")
-+    if( "${ZLIB_H}" MATCHES "ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+)")
-+        set(ZLIB_VERSION_TWEAK "${CMAKE_MATCH_1}")
-+        set(ZLIB_VERSION_STRING "${ZLIB_VERSION_STRING}.${ZLIB_VERSION_TWEAK}")
-+    endif()
-+
-+    set(ZLIB_MAJOR_VERSION "${ZLIB_VERSION_MAJOR}")
-+    set(ZLIB_MINOR_VERSION "${ZLIB_VERSION_MINOR}")
-+    set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}")
-+endif()
-+
-+# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
-+# all listed variables are TRUE
-+include(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB REQUIRED_VARS ZLIB_LIBRARY ZLIB_INCLUDE_DIR
-+                                       VERSION_VAR ZLIB_VERSION_STRING)
-+
-+if(ZLIB_FOUND)
-+    set(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
-+    set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
-+
-+    if(NOT TARGET ZLIB::ZLIB)
-+      add_library(ZLIB::ZLIB UNKNOWN IMPORTED)
-+      set_target_properties(ZLIB::ZLIB PROPERTIES
-+        IMPORTED_LOCATION "${ZLIB_LIBRARY}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
-+    endif()
-+endif()
-diff -Naur tiff-4.6.0/CMakeLists.txt tiff/CMakeLists.txt
--- tiff-4.6.0/CMakeLists.txt	2023-09-13 11:45:24.678250700 -0400
-+++ tiff/CMakeLists.txt	2023-09-13 11:51:32.480189473 -0400
-@@ -24,10 +24,10 @@
- # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- # OF THIS SOFTWARE.
- 
-cmake_minimum_required(VERSION 3.9.0)
-+cmake_minimum_required(VERSION 3.18)
- 
-# Default policy is from 3.9.0
-cmake_policy(VERSION 3.9.0)
-+# Default policy is from 3.18
-+cmake_policy(VERSION 3.18)
- 
- # Find CMake modules in cmake/
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
@@ -0,0 +1,64 @@
+diff -Naur libtiff/cmake/FindJPEG.cmake TIFF_BLD/cmake/FindJPEG.cmake
+--- libtiff/cmake/FindJPEG.cmake	2024-10-11 10:31:38.294245336 -0400
+++ TIFF_BLD/cmake/FindJPEG.cmake	2024-10-11 10:31:04.311837917 -0400
+@@ -56,22 +56,33 @@
+   where to find the JPEG library.
+ #]=======================================================================]
+ 
+-find_path(JPEG_INCLUDE_DIR jpeglib.h)
+set(_JPEG_SEARCHES)
+ 
+-set(jpeg_names ${JPEG_NAMES} jpeg jpeg-static libjpeg libjpeg-static turbojpeg turbojpeg-static)
+-foreach(name ${jpeg_names})
+-  list(APPEND jpeg_names_debug "${name}d")
+# Search JPEG_ROOT first if it is set.
+if(JPEG_ROOT)
+  set(_JPEG_SEARCH_ROOT PATHS ${JPEG_ROOT} NO_DEFAULT_PATH)
+  list(APPEND _JPEG_SEARCHES _JPEG_SEARCH_ROOT)
+endif()
+
+set(JPEG_NAMES ${JPEG_NAMES} jpeg jpeg-static libjpeg libjpeg-static)
+foreach(name ${JPEG_NAMES})
+  list(APPEND JPEG_NAMES_DEBUG "${name}d")
+ endforeach()
+ 
+-if(NOT JPEG_LIBRARY)
+-  find_library(JPEG_LIBRARY_RELEASE NAMES ${jpeg_names} NAMES_PER_DIR)
+-  find_library(JPEG_LIBRARY_DEBUG NAMES ${jpeg_names_debug} NAMES_PER_DIR)
+# Try each search configuration.
+foreach(search ${_JPEG_SEARCHES})
+	message("search: ${search}")
+	message("JPEG_NAMES: ${JPEG_NAMES}")
+  find_path(JPEG_INCLUDE_DIR NAMES jpeglib.h     ${${search}} PATH_SUFFIXES include)
+  find_library(JPEG_LIBRARY_RELEASE NAMES ${JPEG_NAMES} ${${search}} PATH_SUFFIXES lib)
+  find_library(JPEG_LIBRARY_DEBUG NAMES ${JPEG_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib)
+   include(SelectLibraryConfigurations)
+   select_library_configurations(JPEG)
+   mark_as_advanced(JPEG_LIBRARY_RELEASE JPEG_LIBRARY_DEBUG)
+-endif()
+-unset(jpeg_names)
+-unset(jpeg_names_debug)
+endforeach()
+
+unset(JPEG_NAMES)
+unset(JPEG_NAMES_DEBUG)
+ 
+ if(JPEG_INCLUDE_DIR)
+   file(GLOB _JPEG_CONFIG_HEADERS_FEDORA "${JPEG_INCLUDE_DIR}/jconfig*.h")
+diff -Naur libtiff/CMakeLists.txt TIFF_BLD/CMakeLists.txt
+--- libtiff/CMakeLists.txt	2024-10-11 10:31:38.292245370 -0400
+++ TIFF_BLD/CMakeLists.txt	2024-10-11 10:31:04.312837900 -0400
+@@ -24,10 +24,10 @@
+ # LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ # OF THIS SOFTWARE.
+ 
+-cmake_minimum_required(VERSION 3.9.0)
+cmake_minimum_required(VERSION 3.18)
+ 
+-# Default policy is from 3.9.0
+-cmake_policy(VERSION 3.9.0)
+# Default policy is from 3.18
+cmake_policy(VERSION 3.18)
+ 
+ # Find CMake modules in cmake/
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
@@ -47,6 +47,7 @@ if (ENABLE_TKHTML)
    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tkhtml"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DBIN_DIR=$<IF:$<BOOL:${WIN32}>,${LIB_DIR},${BIN_DIR}>
    -DLIB_DIR=${LIB_DIR}
@@ -57,7 +58,7 @@ if (ENABLE_TKHTML)
    -DINCLUDE_DIR=${INCLUDE_DIR}
    -DSHARED_DIR=${LIB_DIR}
    -DTCL_ENABLE_TK=ON
-    -DTCL_ROOT=$<$<BOOL:${TCL_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${TCL_TARGET}>:-DTCL_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    LOG_CONFIGURE ${EXT_BUILD_QUIET}
    LOG_BUILD ${EXT_BUILD_QUIET}
    LOG_INSTALL ${EXT_BUILD_QUIET}
@@ -48,6 +48,7 @@ if (ENABLE_TKTABLE)
    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tktable"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DBIN_DIR=$<IF:$<BOOL:${WIN32}>,${LIB_DIR},${BIN_DIR}>
    -DLIB_DIR=${LIB_DIR}
@@ -58,7 +59,7 @@ if (ENABLE_TKTABLE)
    -DINCLUDE_DIR=${INCLUDE_DIR}
    -DSHARED_DIR=${LIB_DIR}
    -DTCL_ENABLE_TK=ON
-    -DTCL_ROOT=$<$<BOOL:${TCL_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${TCL_TARGET}>:-DTCL_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    LOG_CONFIGURE ${EXT_BUILD_QUIET}
    LOG_BUILD ${EXT_BUILD_QUIET}
    LOG_INSTALL ${EXT_BUILD_QUIET}
@@ -15,6 +15,7 @@ if (ENABLE_UTAHRLE)
    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/utahrle"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
@@ -12,8 +12,9 @@ if (ENABLE_XERCES_C)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/xerces-c.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
-    -DICU_ROOT=$<$<BOOL:${ICU_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    $<$<BOOL:${ICU_TARGET}>:-DICU_ROOT=${CMAKE_BUNDLE_INSTALL_PREFIX}>
    -Dnetwork=OFF
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
@@ -30,6 +30,7 @@ if (ENABLE_XMLTOOLS)
    SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/xmltools"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
@@ -12,6 +12,7 @@ if (ENABLE_YAML_CPP)
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
    -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
@@ -19,8 +19,13 @@ if (ENABLE_ZLIB)
  ExternalProject_Add(ZLIB_BLD
    URL "${CMAKE_CURRENT_SOURCE_DIR}/zlib"
    BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
-    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/zlib.patch
+    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/zlib_cmake.patch
+    COMMAND ${CMAKE_COMMAND};-E;rename;<SOURCE_DIR>/zlib.h;<SOURCE_DIR>/zlib.h.in
+    COMMAND ${CMAKE_COMMAND};-E;rename;<SOURCE_DIR>/zconf.h;<SOURCE_DIR>/zconf.h.in
+    COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/zlib_rc.patch
+    COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/zlib_prefix.patch
    CMAKE_ARGS
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    ${BUILD_TYPE_SPECIFIER}
    -DZ_PREFIX_STR=${Z_PREFIX_STR}
    -DZLIB_BUILD_EXAMPLES=OFF
@@ -0,0 +1,232 @@
+--- zlib/CMakeLists.txt	2024-10-11 12:16:24.041568864 -0400
+++ ZLIB_BLD/CMakeLists.txt	2024-10-11 12:24:35.678684011 -0400
+@@ -7,11 +7,11 @@
+ 
+ option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" ON)
+ 
+-set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
+-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
+-set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
+-set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
+-set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
+set(INSTALL_BIN_DIR "bin" CACHE PATH "Installation directory for executables")
+set(INSTALL_LIB_DIR "lib" CACHE PATH "Installation directory for libraries")
+set(INSTALL_INC_DIR "include" CACHE PATH "Installation directory for headers")
+set(INSTALL_MAN_DIR "share/man" CACHE PATH "Installation directory for manual pages")
+set(INSTALL_PKGCONFIG_DIR "share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
+ 
+ include(CheckTypeSize)
+ include(CheckFunctionExists)
+@@ -57,41 +57,36 @@
+ # Check for unistd.h
+ #
+ check_include_file(unistd.h Z_HAVE_UNISTD_H)
+if(Z_HAVE_UNISTD_H)
+  add_definitions(-DZ_HAVE_UNISTD_H)
+endif(Z_HAVE_UNISTD_H)
+
+option(ENABLE_Z_PREFIX "Add z_ prefix to all library functions." OFF)
+if (DEFINED Z_PREFIX_STR)
+  set (ENABLE_Z_PREFIX ON CACHE BOOL "Ensure prefix is set" FORCE)
+endif (DEFINED Z_PREFIX_STR)
+if (ENABLE_Z_PREFIX)
+  set(Z_PREFIX 1)
+endif (ENABLE_Z_PREFIX)
+mark_as_advanced (ENABLE_Z_PREFIX)
+mark_as_advanced (Z_PREFIX_STR)
+ 
+ if(MSVC)
+     set(CMAKE_DEBUG_POSTFIX "d")
+     add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+     add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+-    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+ endif()
+ 
+-if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
+-    # If we're doing an out of source build and the user has a zconf.h
+-    # in their source tree...
+-    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
+-        message(STATUS "Renaming")
+-        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
+-        message(STATUS "to 'zconf.h.included' because this file is included with zlib")
+-        message(STATUS "but CMake generates it automatically in the build directory.")
+-        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
+-  endif()
+-endif()
+-
+-set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
+-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
+-		${ZLIB_PC} @ONLY)
+-configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
+-		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
+-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+-
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.in ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib.h.in  ${CMAKE_CURRENT_BINARY_DIR}/zlib.h  @ONLY)
+ 
+ #============================================================================
+ # zlib
+ #============================================================================
+ 
+ set(ZLIB_PUBLIC_HDRS
+-    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
+-    zlib.h
+  ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
+  ${CMAKE_CURRENT_BINARY_DIR}/zlib.h
+ )
+ set(ZLIB_PRIVATE_HDRS
+     crc32.h
+@@ -122,14 +117,8 @@
+     zutil.c
+ )
+ 
+-if(NOT MINGW)
+-    set(ZLIB_DLL_SRCS
+-        win32/zlib1.rc # If present will override custom build rule below.
+-    )
+-endif()
+-
+ # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
+-file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
+file(READ ${CMAKE_CURRENT_BINARY_DIR}/zlib.h _zlib_h_contents)
+ string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
+     "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
+ 
+@@ -147,16 +136,47 @@
+                             -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                             -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
+     set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+else(MINGW)
+  set(ZLIB_DLL_SRCS ${ZLIB_DLL_SRCS} win32/zlib1.rc)
+ endif(MINGW)
+ 
+ add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+-target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+set_target_properties(zlib PROPERTIES OUTPUT_NAME z_brl)
+target_include_directories(zlib PUBLIC
+	$<INSTALL_INTERFACE:include>
+	PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+	)
+if(ENABLE_Z_PREFIX)
+  target_compile_definitions(zlib PUBLIC -DZ_PREFIX)
+endif()
+ add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+-target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+if (NOT MSVC)
+  set_target_properties(zlibstatic PROPERTIES OUTPUT_NAME z_brl)
+else (NOT MSVC)
+  set_target_properties(zlibstatic PROPERTIES OUTPUT_NAME z_brl-static)
+endif (NOT MSVC)
+if(CMAKE_CL_64)
+  set_target_properties(zlibstatic PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
+elseif(MSVC)
+  set_target_properties(zlibstatic PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x86")
+endif(CMAKE_CL_64)
+target_include_directories(zlibstatic PUBLIC
+	$<INSTALL_INTERFACE:include>
+	PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+	)
+if(ENABLE_Z_PREFIX)
+  target_compile_definitions(zlibstatic PUBLIC -DZ_PREFIX)
+endif()
+ set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+ set_target_properties(zlib PROPERTIES SOVERSION 1)
+ 
+-if(NOT CYGWIN)
+# OpenBSD has its own naming conventions.  Set a platform variable based on
+# the OS name so we can test for it succinctly.
+if ("${CMAKE_SYSTEM}" MATCHES ".*OpenBSD.*")
+  set(OPENBSD ON)
+endif ("${CMAKE_SYSTEM}" MATCHES ".*OpenBSD.*")
+
+if(NOT CYGWIN AND NOT OPENBSD)
+     # This property causes shared libraries on Linux to have the full version
+     # encoded into their final filename.  We disable this on Cygwin because
+     # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
+@@ -165,24 +185,38 @@
+     # This has no effect with MSVC, on that platform the version info for
+     # the DLL comes from the resource file win32/zlib1.rc
+     set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
+    set_target_properties(zlib PROPERTIES SOVERSION 1)
+ endif()
+ 
+-if(UNIX)
+-    # On unix-like platforms the library is almost always called libz
+-   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
+-   if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))
+-     set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
+-   endif()
+-elseif(BUILD_SHARED_LIBS AND WIN32)
+-    # Creates zlib1.dll when building shared library version
+-    set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
+-endif()
+if (OPENBSD)
+  set_target_properties(zlib PROPERTIES VERSION 1.3)
+endif (OPENBSD)
+ 
+ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
+-    install(TARGETS zlib zlibstatic
+-        RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+-        ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+-        LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
+	install(TARGETS zlib zlibstatic
+		EXPORT zlibTargets
+		RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+		ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+		LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
+	include(CMakePackageConfigHelpers)
+	configure_package_config_file(
+		${CMAKE_CURRENT_SOURCE_DIR}/ZLIBConfig.cmake.in
+		${CMAKE_CURRENT_BINARY_DIR}/ZLIBConfig.cmake
+		INSTALL_DESTINATION ${INSTALL_LIB_DIR}/cmake/ZLIB
+		PATH_VARS CMAKE_INSTALL_PREFIX
+		)
+	write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ZLIBConfigVersion.cmake
+		VERSION ${VERSION}
+		COMPATIBILITY SameMajorVersion)
+	install(
+		EXPORT zlibTargets
+		NAMESPACE zlib::
+		DESTINATION ${INSTALL_LIB_DIR}/cmake/ZLIB
+		)
+	install(FILES
+	  	${CMAKE_CURRENT_BINARY_DIR}/ZLIBConfigVersion.cmake
+		${CMAKE_CURRENT_BINARY_DIR}/ZLIBConfig.cmake
+		DESTINATION ${INSTALL_LIB_DIR}/cmake/ZLIB)
+ endif()
+ if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
+     install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
+@@ -216,3 +250,4 @@
+         set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+     endif()
+ endif()
+
+--- zlib/ZLIBConfig.cmake.in	1969-12-31 19:00:00.000000000 -0500
+++ ZLIB_BLD/ZLIBConfig.cmake.in	2024-10-11 16:07:48.044112298 -0400
+@@ -0,0 +1,22 @@
+# See https://cmake.org/cmake/help/latest/module/CMakePackageConfigHelpers.html
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/zlibTargets.cmake")
+
+if(NOT TARGET ZLIB::ZLIB)
+  add_library(ZLIB::ZLIB INTERFACE IMPORTED)
+  add_library(ZLIB::zlib INTERFACE IMPORTED)
+  if(TARGET zlib::zlib)
+    target_link_libraries(ZLIB::ZLIB INTERFACE zlib::zlib)
+    target_link_libraries(ZLIB::zlib INTERFACE zlib::zlib)
+	 get_target_property(zl zlib::zlib LOCATION)
+  elseif(TARGET zlib::zlibstatic)
+    target_link_libraries(ZLIB::ZLIB INTERFACE zlib::zlibstatic)
+    target_link_libraries(ZLIB::zlib INTERFACE zlib::zlibstatic)
+	 get_target_property(zl zlib::zlibstatic LOCATION)
+  endif()
+  set_target_properties(ZLIB::ZLIB PROPERTIES LOCATION ${zl})
+  set_target_properties(ZLIB::zlib PROPERTIES LOCATION ${zl})
+endif()
+set(ZLIB_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_PREFIX@/@INSTALL_INC_DIR@")
+set(ZLIB_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/@INSTALL_INC_DIR@")
+set(ZLIB_LIBRARY ZLIB::ZLIB)
+set(ZLIB_LIBRARY_DEBUG ZLIB::ZLIB)
+set(ZLIB_LIBRARY_RELEASE ZLIB::ZLIB)
+
@@ -0,0 +1,531 @@
+diff -Naur zlib/deflate.c ZLIB_BLD/deflate.c
+--- zlib/deflate.c	2024-10-09 13:07:47.877000463 -0400
+++ ZLIB_BLD/deflate.c	2024-10-09 13:07:27.611336342 -0400
+@@ -52,7 +52,7 @@
+ #include "deflate.h"
+ 
+ const char deflate_copyright[] =
+-   " deflate 1.3.1 Copyright 1995-2024 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.3.1-brl Copyright 1995-2024 Jean-loup Gailly and Mark Adler ";
+ /*
+   If you use the zlib library in a product, an acknowledgment is welcome
+   in the documentation of your product. If for some reason you cannot
+diff -Naur zlib/gzguts.h ZLIB_BLD/gzguts.h
+--- zlib/gzguts.h	2024-10-09 13:07:47.877000463 -0400
+++ ZLIB_BLD/gzguts.h	2024-10-09 13:07:27.611336342 -0400
+@@ -25,6 +25,10 @@
+ #  include <limits.h>
+ #endif
+ 
+#ifdef Z_HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
+
+ #ifndef _POSIX_SOURCE
+ #  define _POSIX_SOURCE
+ #endif
+diff -Naur zlib/gzread.c ZLIB_BLD/gzread.c
+--- zlib/gzread.c	2024-10-09 13:07:47.877000463 -0400
+++ ZLIB_BLD/gzread.c	2024-10-09 13:07:27.611336342 -0400
+@@ -400,9 +400,7 @@
+ }
+ 
+ /* -- see zlib.h -- */
+-#ifdef Z_PREFIX_SET
+-#  undef z_gzgetc
+-#else
+#ifdef gzgetc
+ #  undef gzgetc
+ #endif
+ int ZEXPORT gzgetc(gzFile file) {
+diff -Naur zlib/inftrees.c ZLIB_BLD/inftrees.c
+--- zlib/inftrees.c	2024-10-09 13:07:47.877000463 -0400
+++ ZLIB_BLD/inftrees.c	2024-10-09 13:07:27.612336325 -0400
+@@ -9,7 +9,7 @@
+ #define MAXBITS 15
+ 
+ const char inflate_copyright[] =
+-   " inflate 1.3.1 Copyright 1995-2024 Mark Adler ";
+   " inflate 1.3.1-brl Copyright 1995-2024 Mark Adler ";
+ /*
+   If you use the zlib library in a product, an acknowledgment is welcome
+   in the documentation of your product. If for some reason you cannot
+diff -Naur zlib/zconf.h.in ZLIB_BLD/zconf.h.in
+--- zlib/zconf.h.in	2024-10-09 13:07:47.878000446 -0400
+++ ZLIB_BLD/zconf.h.in	2024-10-09 13:07:27.613336308 -0400
+@@ -3,8 +3,6 @@
+  * For conditions of distribution and use, see copyright notice in zlib.h
+  */
+ 
+-/* @(#) $Id$ */
+-
+ #ifndef ZCONF_H
+ #define ZCONF_H
+ 
+@@ -14,157 +12,186 @@
+  * Even better than compiling with -DZ_PREFIX would be to use configure to set
+  * this permanently in zconf.h using "./configure --zprefix".
+  */
+-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
+
+#cmakedefine Z_PREFIX 1
+#cmakedefine Z_PREFIX_STR @Z_PREFIX_STR@
+#ifdef Z_PREFIX
+
+ #  define Z_PREFIX_SET
+ 
+/* Allow a user configurable prefix string, defaulting to "z_" */
+#  if !defined(Z_PREFIX_STR)
+#    define Z_PREFIX_STR z_
+#  endif
+#  define ZLIB_CONCAT2(a, b) a ## b
+#  define ZLIB_CONCAT(a, b) ZLIB_CONCAT2(a,b)
+#  define Z_ADD_PREFIX(b) ZLIB_CONCAT(Z_PREFIX_STR,b)
+
+/*
+ * For macros the standard prefix is always used, as we can't define them using
+ * names constructed using arbitrary Z_PREFIX_ value -- but luckily this
+ * doesn't matter anyhow, because we can't have link-time conflicts for macros.
+ */
+#define Z_ADD_PREFIX_STD(name) ZLIB_CONCAT(z_, name)
+
+#if 0
+/* For debug messages */
+#define STR_HELPER(x) #x
+#define STR(x) STR_HELPER(x)
+#pragma message("define _dist_code: " STR(_dist_code))
+#endif
+
+ /* all linked symbols and init macros */
+-#  define _dist_code            z__dist_code
+-#  define _length_code          z__length_code
+-#  define _tr_align             z__tr_align
+-#  define _tr_flush_bits        z__tr_flush_bits
+-#  define _tr_flush_block       z__tr_flush_block
+-#  define _tr_init              z__tr_init
+-#  define _tr_stored_block      z__tr_stored_block
+-#  define _tr_tally             z__tr_tally
+-#  define adler32               z_adler32
+-#  define adler32_combine       z_adler32_combine
+-#  define adler32_combine64     z_adler32_combine64
+-#  define adler32_z             z_adler32_z
+#  define _dist_code            Z_ADD_PREFIX(_dist_code)
+#  define _length_code          Z_ADD_PREFIX(_length_code)
+#  define _tr_align             Z_ADD_PREFIX(_tr_align)
+#  define _tr_flush_bits        Z_ADD_PREFIX(_tr_flush_bits)
+#  define _tr_flush_block       Z_ADD_PREFIX(_tr_flush_block)
+#  define _tr_init              Z_ADD_PREFIX(_tr_init)
+#  define _tr_stored_block      Z_ADD_PREFIX(_tr_stored_block)
+#  define _tr_tally             Z_ADD_PREFIX(_tr_tally)
+#  define adler32               Z_ADD_PREFIX(adler32)
+#  define adler32_combine       Z_ADD_PREFIX(adler32_combine)
+#  define adler32_combine64     Z_ADD_PREFIX(adler32_combine64)
+#  define adler32_z             Z_ADD_PREFIX(adler32_z)
+ #  ifndef Z_SOLO
+-#    define compress              z_compress
+-#    define compress2             z_compress2
+-#    define compressBound         z_compressBound
+-#  endif
+-#  define crc32                 z_crc32
+-#  define crc32_combine         z_crc32_combine
+-#  define crc32_combine64       z_crc32_combine64
+-#  define crc32_combine_gen     z_crc32_combine_gen
+-#  define crc32_combine_gen64   z_crc32_combine_gen64
+-#  define crc32_combine_op      z_crc32_combine_op
+-#  define crc32_z               z_crc32_z
+-#  define deflate               z_deflate
+-#  define deflateBound          z_deflateBound
+-#  define deflateCopy           z_deflateCopy
+-#  define deflateEnd            z_deflateEnd
+-#  define deflateGetDictionary  z_deflateGetDictionary
+-#  define deflateInit           z_deflateInit
+-#  define deflateInit2          z_deflateInit2
+-#  define deflateInit2_         z_deflateInit2_
+-#  define deflateInit_          z_deflateInit_
+-#  define deflateParams         z_deflateParams
+-#  define deflatePending        z_deflatePending
+-#  define deflatePrime          z_deflatePrime
+-#  define deflateReset          z_deflateReset
+-#  define deflateResetKeep      z_deflateResetKeep
+-#  define deflateSetDictionary  z_deflateSetDictionary
+-#  define deflateSetHeader      z_deflateSetHeader
+-#  define deflateTune           z_deflateTune
+-#  define deflate_copyright     z_deflate_copyright
+-#  define get_crc_table         z_get_crc_table
+#    define compress              Z_ADD_PREFIX(compress)
+#    define compress2             Z_ADD_PREFIX(compress2)
+#    define compressBound         Z_ADD_PREFIX(compressBound)
+#  endif
+#  define crc32                 Z_ADD_PREFIX(crc32)
+#  define crc32_combine         Z_ADD_PREFIX(crc32_combine)
+#  define crc32_combine64       Z_ADD_PREFIX(crc32_combine64)
+#  define crc32_combine_gen     Z_ADD_PREFIX(crc32_combine_gen)
+#  define crc32_combine_gen64   Z_ADD_PREFIX(crc32_combine_gen64)
+#  define crc32_combine_op      Z_ADD_PREFIX(crc32_combine_op)
+#  define crc32_z               Z_ADD_PREFIX(crc32_z)
+#  define deflate               Z_ADD_PREFIX(deflate)
+#  define deflateBound          Z_ADD_PREFIX(deflateBound)
+#  define deflateCopy           Z_ADD_PREFIX(deflateCopy)
+#  define deflateEnd            Z_ADD_PREFIX(deflateEnd)
+#  define deflateGetDictionary  Z_ADD_PREFIX(deflateGetDictionary)
+#  define deflateInit           Z_ADD_PREFIX(deflateInit)
+#  define deflateInit2          Z_ADD_PREFIX(deflateInit2)
+#  define deflateInit2_         Z_ADD_PREFIX(deflateInit2_)
+#  define deflateInit_          Z_ADD_PREFIX(deflateInit_)
+#  define deflateParams         Z_ADD_PREFIX(deflateParams)
+#  define deflatePending        Z_ADD_PREFIX(deflatePending)
+#  define deflatePrime          Z_ADD_PREFIX(deflatePrime)
+#  define deflateReset          Z_ADD_PREFIX(deflateReset)
+#  define deflateResetKeep      Z_ADD_PREFIX(deflateResetKeep)
+#  define deflateSetDictionary  Z_ADD_PREFIX(deflateSetDictionary)
+#  define deflateSetHeader      Z_ADD_PREFIX(deflateSetHeader)
+#  define deflateTune           Z_ADD_PREFIX(deflateTune)
+#  define deflate_copyright     Z_ADD_PREFIX(deflate_copyright)
+#  define get_crc_table         Z_ADD_PREFIX(get_crc_table)
+ #  ifndef Z_SOLO
+-#    define gz_error              z_gz_error
+-#    define gz_intmax             z_gz_intmax
+-#    define gz_strwinerror        z_gz_strwinerror
+-#    define gzbuffer              z_gzbuffer
+-#    define gzclearerr            z_gzclearerr
+-#    define gzclose               z_gzclose
+-#    define gzclose_r             z_gzclose_r
+-#    define gzclose_w             z_gzclose_w
+-#    define gzdirect              z_gzdirect
+-#    define gzdopen               z_gzdopen
+-#    define gzeof                 z_gzeof
+-#    define gzerror               z_gzerror
+-#    define gzflush               z_gzflush
+-#    define gzfread               z_gzfread
+-#    define gzfwrite              z_gzfwrite
+-#    define gzgetc                z_gzgetc
+-#    define gzgetc_               z_gzgetc_
+-#    define gzgets                z_gzgets
+-#    define gzoffset              z_gzoffset
+-#    define gzoffset64            z_gzoffset64
+-#    define gzopen                z_gzopen
+-#    define gzopen64              z_gzopen64
+#    define gz_error              Z_ADD_PREFIX(gz_error)
+#    define gz_intmax             Z_ADD_PREFIX(gz_intmax)
+#    define gz_strwinerror        Z_ADD_PREFIX(gz_strwinerror)
+#    define gzbuffer              Z_ADD_PREFIX(gzbuffer)
+#    define gzclearerr            Z_ADD_PREFIX(gzclearerr)
+#    define gzclose               Z_ADD_PREFIX(gzclose)
+#    define gzclose_r             Z_ADD_PREFIX(gzclose_r)
+#    define gzclose_w             Z_ADD_PREFIX(gzclose_w)
+#    define gzdirect              Z_ADD_PREFIX(gzdirect)
+#    define gzdopen               Z_ADD_PREFIX(gzdopen)
+#    define gzeof                 Z_ADD_PREFIX(gzeof)
+#    define gzerror               Z_ADD_PREFIX(gzerror)
+#    define gzflush               Z_ADD_PREFIX(gzflush)
+#    define gzfread               Z_ADD_PREFIX(gzfread)
+#    define gzfwrite              Z_ADD_PREFIX(gzfwrite)
+#    define gzgetc                Z_ADD_PREFIX(gzgetc)
+#    define gzgetc_               Z_ADD_PREFIX(gzgetc_)
+#    define gzgets                Z_ADD_PREFIX(gzgets)
+#    define gzoffset              Z_ADD_PREFIX(gzoffset)
+#    define gzoffset64            Z_ADD_PREFIX(gzoffset64)
+#    define gzopen                Z_ADD_PREFIX(gzopen)
+#    define gzopen64              Z_ADD_PREFIX(gzopen64)
+ #    ifdef _WIN32
+-#      define gzopen_w              z_gzopen_w
+#      define gzopen_w              Z_ADD_PREFIX(gzopen_w)
+ #    endif
+-#    define gzprintf              z_gzprintf
+-#    define gzputc                z_gzputc
+-#    define gzputs                z_gzputs
+-#    define gzread                z_gzread
+-#    define gzrewind              z_gzrewind
+-#    define gzseek                z_gzseek
+-#    define gzseek64              z_gzseek64
+-#    define gzsetparams           z_gzsetparams
+-#    define gztell                z_gztell
+-#    define gztell64              z_gztell64
+-#    define gzungetc              z_gzungetc
+-#    define gzvprintf             z_gzvprintf
+-#    define gzwrite               z_gzwrite
+-#  endif
+-#  define inflate               z_inflate
+-#  define inflateBack           z_inflateBack
+-#  define inflateBackEnd        z_inflateBackEnd
+-#  define inflateBackInit       z_inflateBackInit
+-#  define inflateBackInit_      z_inflateBackInit_
+-#  define inflateCodesUsed      z_inflateCodesUsed
+-#  define inflateCopy           z_inflateCopy
+-#  define inflateEnd            z_inflateEnd
+-#  define inflateGetDictionary  z_inflateGetDictionary
+-#  define inflateGetHeader      z_inflateGetHeader
+-#  define inflateInit           z_inflateInit
+-#  define inflateInit2          z_inflateInit2
+-#  define inflateInit2_         z_inflateInit2_
+-#  define inflateInit_          z_inflateInit_
+-#  define inflateMark           z_inflateMark
+-#  define inflatePrime          z_inflatePrime
+-#  define inflateReset          z_inflateReset
+-#  define inflateReset2         z_inflateReset2
+-#  define inflateResetKeep      z_inflateResetKeep
+-#  define inflateSetDictionary  z_inflateSetDictionary
+-#  define inflateSync           z_inflateSync
+-#  define inflateSyncPoint      z_inflateSyncPoint
+-#  define inflateUndermine      z_inflateUndermine
+-#  define inflateValidate       z_inflateValidate
+-#  define inflate_copyright     z_inflate_copyright
+-#  define inflate_fast          z_inflate_fast
+-#  define inflate_table         z_inflate_table
+#    define gzprintf              Z_ADD_PREFIX(gzprintf)
+#    define gzputc                Z_ADD_PREFIX(gzputc)
+#    define gzputs                Z_ADD_PREFIX(gzputs)
+#    define gzread                Z_ADD_PREFIX(gzread)
+#    define gzrewind              Z_ADD_PREFIX(gzrewind)
+#    define gzseek                Z_ADD_PREFIX(gzseek)
+#    define gzseek64              Z_ADD_PREFIX(gzseek64)
+#    define gzsetparams           Z_ADD_PREFIX(gzsetparams)
+#    define gztell                Z_ADD_PREFIX(gztell)
+#    define gztell64              Z_ADD_PREFIX(gztell64)
+#    define gzungetc              Z_ADD_PREFIX(gzungetc)
+#    define gzvprintf             Z_ADD_PREFIX(gzvprintf)
+#    define gzwrite               Z_ADD_PREFIX(gzwrite)
+#  endif
+#  define inflate               Z_ADD_PREFIX(inflate)
+#  define inflateBack           Z_ADD_PREFIX(inflateBack)
+#  define inflateBackEnd        Z_ADD_PREFIX(inflateBackEnd)
+#  define inflateBackInit       Z_ADD_PREFIX(inflateBackInit)
+#  define inflateBackInit_      Z_ADD_PREFIX(inflateBackInit_)
+#  define inflateCodesUsed      Z_ADD_PREFIX(inflateCodesUsed)
+#  define inflateCopy           Z_ADD_PREFIX(inflateCopy)
+#  define inflateEnd            Z_ADD_PREFIX(inflateEnd)
+#  define inflateGetDictionary  Z_ADD_PREFIX(inflateGetDictionary)
+#  define inflateGetHeader      Z_ADD_PREFIX(inflateGetHeader)
+#  define inflateInit           Z_ADD_PREFIX(inflateInit)
+#  define inflateInit2          Z_ADD_PREFIX(inflateInit2)
+#  define inflateInit2_         Z_ADD_PREFIX(inflateInit2_)
+#  define inflateInit_          Z_ADD_PREFIX(inflateInit_)
+#  define inflateMark           Z_ADD_PREFIX(inflateMark)
+#  define inflatePrime          Z_ADD_PREFIX(inflatePrime)
+#  define inflateReset          Z_ADD_PREFIX(inflateReset)
+#  define inflateReset2         Z_ADD_PREFIX(inflateReset2)
+#  define inflateResetKeep      Z_ADD_PREFIX(inflateResetKeep)
+#  define inflateSetDictionary  Z_ADD_PREFIX(inflateSetDictionary)
+#  define inflateSync           Z_ADD_PREFIX(inflateSync)
+#  define inflateSyncPoint      Z_ADD_PREFIX(inflateSyncPoint)
+#  define inflateUndermine      Z_ADD_PREFIX(inflateUndermine)
+#  define inflateValidate       Z_ADD_PREFIX(inflateValidate)
+#  define inflate_copyright     Z_ADD_PREFIX(inflate_copyright)
+#  define inflate_fast          Z_ADD_PREFIX(inflate_fast)
+#  define inflate_table         Z_ADD_PREFIX(inflate_table)
+ #  ifndef Z_SOLO
+-#    define uncompress            z_uncompress
+-#    define uncompress2           z_uncompress2
+#    define uncompress            Z_ADD_PREFIX(uncompress)
+#    define uncompress2           Z_ADD_PREFIX(uncompress2)
+ #  endif
+-#  define zError                z_zError
+#  define zError                Z_ADD_PREFIX(zError)
+ #  ifndef Z_SOLO
+-#    define zcalloc               z_zcalloc
+-#    define zcfree                z_zcfree
+#    define zcalloc               Z_ADD_PREFIX(zcalloc)
+#    define zcfree                Z_ADD_PREFIX(zcfree)
+ #  endif
+-#  define zlibCompileFlags      z_zlibCompileFlags
+-#  define zlibVersion           z_zlibVersion
+#  define zlibCompileFlags      Z_ADD_PREFIX(zlibCompileFlags)
+#  define zlibVersion           Z_ADD_PREFIX(zlibVersion)
+ 
+ /* all zlib typedefs in zlib.h and zconf.h */
+-#  define Byte                  z_Byte
+-#  define Bytef                 z_Bytef
+-#  define alloc_func            z_alloc_func
+-#  define charf                 z_charf
+-#  define free_func             z_free_func
+#  define Byte                  Z_ADD_PREFIX(Byte)
+#  define Bytef                 Z_ADD_PREFIX(Bytef)
+#  define alloc_func            Z_ADD_PREFIX(alloc_func)
+#  define charf                 Z_ADD_PREFIX(charf)
+#  define free_func             Z_ADD_PREFIX(free_func)
+ #  ifndef Z_SOLO
+-#    define gzFile                z_gzFile
+#    define gzFile                Z_ADD_PREFIX(gzFile)
+ #  endif
+-#  define gz_header             z_gz_header
+-#  define gz_headerp            z_gz_headerp
+-#  define in_func               z_in_func
+-#  define intf                  z_intf
+-#  define out_func              z_out_func
+-#  define uInt                  z_uInt
+-#  define uIntf                 z_uIntf
+-#  define uLong                 z_uLong
+-#  define uLongf                z_uLongf
+-#  define voidp                 z_voidp
+-#  define voidpc                z_voidpc
+-#  define voidpf                z_voidpf
+#  define gz_header             Z_ADD_PREFIX(gz_header)
+#  define gz_headerp            Z_ADD_PREFIX(gz_headerp)
+#  define in_func               Z_ADD_PREFIX(in_func)
+#  define intf                  Z_ADD_PREFIX(intf)
+#  define out_func              Z_ADD_PREFIX(out_func)
+#  define uInt                  Z_ADD_PREFIX(uInt)
+#  define uIntf                 Z_ADD_PREFIX(uIntf)
+#  define uLong                 Z_ADD_PREFIX(uLong)
+#  define uLongf                Z_ADD_PREFIX(uLongf)
+#  define voidp                 Z_ADD_PREFIX(voidp)
+#  define voidpc                Z_ADD_PREFIX(voidpc)
+#  define voidpf                Z_ADD_PREFIX(voidpf)
+ 
+ /* all zlib structs in zlib.h and zconf.h */
+-#  define gz_header_s           z_gz_header_s
+-#  define internal_state        z_internal_state
+#  define gz_header_s           Z_ADD_PREFIX(gz_header_s)
+#  define internal_state        Z_ADD_PREFIX(internal_state)
+
+/* variable from zutil.h */
+#  define z_errmsg 		Z_ADD_PREFIX(z_errmsg)
+ 
+ #endif
+ 
+@@ -300,6 +327,14 @@
+ #  endif
+ #endif
+ 
+#ifndef Z_ARG /* function prototypes for stdarg */
+#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#    define Z_ARG(args)  args
+#  else
+#    define Z_ARG(args)  ()
+#  endif
+#endif
+
+ /* The following definitions for FAR are needed only for MSDOS mixed
+  * model programming (small or medium model with some far allocations).
+  * This was tested only with MSC; for other MSDOS compilers you may have
+@@ -503,6 +538,29 @@
+ #  define Z_WANT64
+ #endif
+ 
+#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64) && defined(Z_PREFIX_STR)
+/*
+ * It turns out that some of the functions defined above using custom prefix
+ * will actually be macros in this library build, so they must use standard
+ * prefix instead. Ugly, but we need to redefine them as we couldn't define
+ * them correctly from the beginning as Z_WANT64 wasn't available then yet.
+ */
+#  undef adler32_combine
+#  define adler32_combine       Z_ADD_PREFIX_STD(adler32_combine)
+#  undef crc32_combine
+#  define crc32_combine         Z_ADD_PREFIX_STD(crc32_combine)
+#  ifndef Z_SOLO
+#    undef gzoffset
+#    define gzoffset              Z_ADD_PREFIX_STD(gzoffset)
+#    undef gzopen
+#    define gzopen                Z_ADD_PREFIX_STD(gzopen)
+#    undef gzseek
+#    define gzseek                Z_ADD_PREFIX_STD(gzseek)
+#    undef gztell
+#    define gztell                Z_ADD_PREFIX_STD(gztell)
+#  endif
+#endif
+
+ #if !defined(SEEK_SET) && !defined(Z_SOLO)
+ #  define SEEK_SET        0       /* Seek from beginning of file.  */
+ #  define SEEK_CUR        1       /* Seek from current position.  */
+@@ -516,7 +574,7 @@
+ #if !defined(_WIN32) && defined(Z_LARGE64)
+ #  define z_off64_t off64_t
+ #else
+-#  if defined(_WIN32) && !defined(__GNUC__)
+#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+ #    define z_off64_t __int64
+ #  else
+ #    define z_off64_t z_off_t
+diff -Naur zlib/zlib.h.in ZLIB_BLD/zlib.h.in
+--- zlib/zlib.h.in	2024-10-09 13:07:47.878000446 -0400
+++ ZLIB_BLD/zlib.h.in	2024-10-09 13:07:27.616336259 -0400
+@@ -26,6 +26,11 @@
+   The data format used by the zlib library is described by RFCs (Request for
+   Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+   (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
+
+  NOTE (2022-11-09): while this copy of Zlib is not intended to be functionally
+  altered from the upstream library, the sources are modified to allow a custom
+  prefix to be successfully defined for embedding without conflicting with
+  system Zlib versions - CY
+ */
+ 
+ #ifndef ZLIB_H
+@@ -37,7 +42,7 @@
+ extern "C" {
+ #endif
+ 
+-#define ZLIB_VERSION "1.3.1"
+#define ZLIB_VERSION "1.3.1.f-brl"
+ #define ZLIB_VERNUM 0x1310
+ #define ZLIB_VER_MAJOR 1
+ #define ZLIB_VER_MINOR 3
+@@ -1796,17 +1801,17 @@
+                                      const char *version,
+                                      int stream_size);
+ #ifdef Z_PREFIX_SET
+-#  define z_deflateInit(strm, level) \
+#  define @Z_PREFIX_STR@deflateInit(strm, level) \
+           deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+-#  define z_inflateInit(strm) \
+#  define @Z_PREFIX_STR@inflateInit(strm) \
+           inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+-#  define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+#  define @Z_PREFIX_STR@deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+           deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                         (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+-#  define z_inflateInit2(strm, windowBits) \
+#  define @Z_PREFIX_STR@inflateInit2(strm, windowBits) \
+           inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+                         (int)sizeof(z_stream))
+-#  define z_inflateBackInit(strm, windowBits, window) \
+#  define @Z_PREFIX_STR@inflateBackInit(strm, windowBits, window) \
+           inflateBackInit_((strm), (windowBits), (window), \
+                            ZLIB_VERSION, (int)sizeof(z_stream))
+ #else
+@@ -1841,8 +1846,8 @@
+ };
+ ZEXTERN int ZEXPORT gzgetc_(gzFile file);       /* backward compatibility */
+ #ifdef Z_PREFIX_SET
+-#  undef z_gzgetc
+-#  define z_gzgetc(g) \
+#  undef @Z_PREFIX_STR@gzgetc
+#  define @Z_PREFIX_STR@gzgetc(g) \
+           ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
+ #else
+ #  define gzgetc(g) \
+@@ -1867,13 +1872,13 @@
+ 
+ #if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
+ #  ifdef Z_PREFIX_SET
+-#    define z_gzopen z_gzopen64
+-#    define z_gzseek z_gzseek64
+-#    define z_gztell z_gztell64
+-#    define z_gzoffset z_gzoffset64
+-#    define z_adler32_combine z_adler32_combine64
+-#    define z_crc32_combine z_crc32_combine64
+-#    define z_crc32_combine_gen z_crc32_combine_gen64
+#    define @Z_PREFIX_STR@gzopen @Z_PREFIX_STR@gzopen64
+#    define @Z_PREFIX_STR@gzseek @Z_PREFIX_STR@gzseek64
+#    define @Z_PREFIX_STR@gztell @Z_PREFIX_STR@gztell64
+#    define @Z_PREFIX_STR@gzoffset @Z_PREFIX_STR@gzoffset64
+#    define @Z_PREFIX_STR@adler32_combine @Z_PREFIX_STR@adler32_combine64
+#    define @Z_PREFIX_STR@crc32_combine @Z_PREFIX_STR@crc32_combine64
+#    define @Z_PREFIX_STR@crc32_combine_gen @Z_PREFIX_STR@crc32_combine_gen64
+ #  else
+ #    define gzopen gzopen64
+ #    define gzseek gzseek64
+@@ -1925,9 +1930,9 @@
+ #endif
+ #if defined(STDC) || defined(Z_HAVE_STDARG_H)
+ #  ifndef Z_SOLO
+-ZEXTERN int            ZEXPORTVA gzvprintf(gzFile file,
+-                                           const char *format,
+-                                           va_list va);
+ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
+                                                  const char *format,
+                                                  va_list va));
+ #  endif
+ #endif
+ 
@@ -0,0 +1,10 @@
+diff -Naur zlib/win32/zlib1.rc ZLIB_BLD/win32/zlib1.rc
+--- zlib/win32/zlib1.rc	2024-10-09 12:48:30.618301910 -0400
+++ ZLIB_BLD/win32/zlib1.rc	2024-10-09 12:47:57.246866207 -0400
+@@ -1,5 +1,5 @@
+ #include <winver.h>
+-#include "../zlib.h"
+#include "zlib.h"
+ 
+ #ifdef GCC_WINDRES
+ VS_VERSION_INFO		VERSIONINFO
@@ -14,6 +14,7 @@ if (ENABLE_ZSTD)
    #PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/zstd.patch
    CMAKE_ARGS
    ${BUILD_TYPE_SPECIFIER}
+    -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
    -DZ_PREFIX_STR=${Z_PREFIX_STR}
    -DBIN_DIR=${BIN_DIR}
    -DLIB_DIR=${LIB_DIR}
Author	SHA1	Message	Date
Clifford Yapp	6a90e2b9be	Merge branch 'main' into zlib_config	2024-10-15 16:12:37 -04:00
Clifford Yapp	011bcd2e50	Grab GLM removal from main.	2024-10-15 16:08:03 -04:00
Clifford Yapp	a30fa06819	Missed one of the LLVM configure blocks.	2024-10-15 13:36:03 -04:00
Clifford Yapp	170e285e8a	LLVM wants the LOCATION property on ZLIB::ZLIB - see if we can get it.	2024-10-15 13:35:24 -04:00
Clifford Yapp	370b48c38e	Tweak openimageio CMake options	2024-10-15 13:35:05 -04:00
Clifford Yapp	446551e6b3	Try to do things the 'standard' way	2024-10-15 13:33:10 -04:00
Clifford Yapp	8c2eb31162	Setting Z_PREFIX et. al. in the other builds shouldn't be necessary.	2024-10-11 14:39:54 -04:00
Clifford Yapp	c8a8895ccd	Adjust qtsvg build for new setup	2024-10-11 14:14:23 -04:00
Clifford Yapp	b1b9fa55a1	Remove GDAL use of modded zlib and png find modules.	2024-10-11 13:05:15 -04:00
Clifford Yapp	67903cfa49	Update OpenCV patching to support Config.cmake	2024-10-11 12:51:52 -04:00
Clifford Yapp	a5d4856abf	Try making a version compat file for zlib Need to read more about the helper routines: https://cmake.org/cmake/help/latest/module/CMakePackageConfigHelpers.html Probably should be using those for the Config file as well.	2024-10-11 12:38:34 -04:00
Clifford Yapp	3cf77f505e	Set ZLIB_INCLUDE_DIR while we're at it	2024-10-11 11:36:12 -04:00
Clifford Yapp	1cd1b8f54d	Update opennurbs build for new zlib approach	2024-10-11 11:29:09 -04:00
Clifford Yapp	d350f63884	Get libpng build to work with ZLIBConfig.cmake	2024-10-11 11:25:49 -04:00
Clifford Yapp	09a61a0fe8	Have ZLIBConfig.cmake set ZLIB_INCLUDE_DIRS	2024-10-11 11:23:33 -04:00
Clifford Yapp	3dbeba2664	Rename proj patch to reflect the fact it is CMake centric.	2024-10-11 10:37:56 -04:00
Clifford Yapp	7813e25568	Adjust libtiff for Config.cmake zlib	2024-10-11 10:35:18 -04:00
Clifford Yapp	2b1c757a6a	Enable CMAKE_FIND_PACKAGE_PREFER_CONFIG in all the cmake builds.	2024-10-11 10:18:27 -04:00
Clifford Yapp	b005cc7758	Adjust CMake patch for asset import and zlib	2024-10-11 09:51:28 -04:00
Clifford Yapp	95e98fc564	Support both lower and upper case for zlib target	2024-10-11 09:42:29 -04:00
Clifford Yapp	ffe922ea97	Reapply "See if we can remove the FindZLIB.cmake customization patch from assetimport" This reverts commit `d8dd4807a9`.	2024-10-11 09:29:18 -04:00