Enhance Windows dependency discovery and mapping

Add robust Windows dependency handling and import target mapping for static builds. Introduces helper functions (rawgl_add_imported_interface_alias, rawgl_map_imported_config_targets) and expands platform logic to discover Zlib, WebP, Brotli, BZip2, ICU, EXPAT and other libs under multiple package-name variants. Add RAWGL_WINDOWS_PREFIX_ONLY_FIND and RAWGL_WINDOWS_CONFIGURATION_TYPES options and enforce prefix-based search behavior and configuration mapping for multi-config generators. Improve rawgl_windows_static_link to search CMAKE_PREFIX_PATH and RAWGL_WINDOWS_DEPS_ROOT for prefixed .lib files and auto-detect DNG/XMP SDK libs; update vendor library append/patch routines to use the new prefix search. Wire mapped/imported targets into platform files and target linking (RAWGL_EXTRA_WINDOWS_LIBS), and expose new options in the config summary. Also replace global PNG ignore with bld_* in .gitignore and add several example PNGs.

Author: ssh4net

.gitignore

@@ -45,4 +45,4 @@ logs
 *.vcxproj.user
 __pycache__
 /examples/Sequence/BitshiftSequence_frames
-*.png
+/bld_*

cmake/rawgl_dependencies.cmake

@@ -93,6 +93,28 @@ find_path(RAWGL_JXL_INCLUDE_DIR
     HINTS ${rawgl_dependency_include_hints})
 
 find_package(OpenMeta CONFIG QUIET)
+if(WIN32)
+    if(NOT TARGET EXPAT::EXPAT)
+        find_package(EXPAT QUIET)
+    endif()
+    if(NOT TARGET expat::expat)
+        find_package(expat CONFIG QUIET)
+    endif()
+    if(TARGET expat::expat AND NOT TARGET EXPAT::EXPAT)
+        rawgl_add_imported_interface_alias(EXPAT::EXPAT expat::expat)
+    endif()
+    rawgl_map_imported_config_targets(
+        Brotli::common
+        Brotli::decoder
+        Brotli::encoder
+        Brotli::brotlicommon
+        Brotli::brotlidec
+        Brotli::brotlienc
+        EXPAT::EXPAT
+        expat::expat
+        OpenMeta::openmeta_static
+        OpenMeta::openmeta_shared)
+endif()
 find_path(RAWGL_OPENMETA_INCLUDE_DIR
     NAMES openmeta/simple_meta.h
     HINTS ${rawgl_dependency_prefix_hints}

cmake/rawgl_helpers.cmake

@@ -89,6 +89,62 @@ function(rawgl_windows_config_library_expr out_var release_path debug_path)
     set(${out_var} "${rawgl_expr}" PARENT_SCOPE)
 endfunction()
 
+function(rawgl_add_imported_interface_alias alias_target target_name)
+    if(TARGET ${alias_target} OR NOT TARGET ${target_name})
+        return()
+    endif()
+
+    add_library(${alias_target} INTERFACE IMPORTED)
+    set_target_properties(${alias_target} PROPERTIES
+        INTERFACE_LINK_LIBRARIES "${target_name}")
+endfunction()
+
+function(rawgl_map_imported_config_targets)
+    foreach(rawgl_target_name ${ARGN})
+        if(TARGET ${rawgl_target_name})
+            set(rawgl_fallback_location)
+            set(rawgl_fallback_implib)
+            foreach(rawgl_config_name IN ITEMS RELEASE RELWITHDEBINFO MINSIZEREL NOCONFIG DEBUG)
+                if(NOT rawgl_fallback_location)
+                    get_target_property(rawgl_config_location ${rawgl_target_name} IMPORTED_LOCATION_${rawgl_config_name})
+                    if(rawgl_config_location)
+                        set(rawgl_fallback_location "${rawgl_config_location}")
+                    endif()
+                endif()
+                if(NOT rawgl_fallback_implib)
+                    get_target_property(rawgl_config_implib ${rawgl_target_name} IMPORTED_IMPLIB_${rawgl_config_name})
+                    if(rawgl_config_implib)
+                        set(rawgl_fallback_implib "${rawgl_config_implib}")
+                    endif()
+                endif()
+            endforeach()
+            if(NOT rawgl_fallback_location)
+                get_target_property(rawgl_fallback_location ${rawgl_target_name} IMPORTED_LOCATION)
+            endif()
+            if(NOT rawgl_fallback_implib)
+                get_target_property(rawgl_fallback_implib ${rawgl_target_name} IMPORTED_IMPLIB)
+            endif()
+
+            set_target_properties(${rawgl_target_name} PROPERTIES
+                MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release
+                MAP_IMPORTED_CONFIG_MINSIZEREL Release)
+
+            if(rawgl_fallback_location)
+                set_target_properties(${rawgl_target_name} PROPERTIES
+                    IMPORTED_LOCATION_RELEASE "${rawgl_fallback_location}"
+                    IMPORTED_LOCATION_RELWITHDEBINFO "${rawgl_fallback_location}"
+                    IMPORTED_LOCATION_MINSIZEREL "${rawgl_fallback_location}")
+            endif()
+            if(rawgl_fallback_implib)
+                set_target_properties(${rawgl_target_name} PROPERTIES
+                    IMPORTED_IMPLIB_RELEASE "${rawgl_fallback_implib}"
+                    IMPORTED_IMPLIB_RELWITHDEBINFO "${rawgl_fallback_implib}"
+                    IMPORTED_IMPLIB_MINSIZEREL "${rawgl_fallback_implib}")
+            endif()
+        endif()
+    endforeach()
+endfunction()
+
 function(rawgl_apply_windows_debug_suffix target_name)
     if(NOT WIN32)
         return()

cmake/rawgl_options.cmake

@@ -10,8 +10,10 @@ set(RAWGL_WINDOWS_XMP_CORE_LIBRARY_RELEASE "" CACHE FILEPATH "Windows release XM
 set(RAWGL_WINDOWS_XMP_CORE_LIBRARY_DEBUG "" CACHE FILEPATH "Windows debug XMP core library")
 set(RAWGL_WINDOWS_XMP_FILES_LIBRARY_RELEASE "" CACHE FILEPATH "Windows release XMP files library")
 set(RAWGL_WINDOWS_XMP_FILES_LIBRARY_DEBUG "" CACHE FILEPATH "Windows debug XMP files library")
+set(RAWGL_WINDOWS_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Windows multi-config generator configurations. Leave empty to keep the generator default.")
 set(RAWGL_MINIPLY_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/miniply" CACHE PATH "Directory containing miniply.h")
 option(RAWGL_WINDOWS_UTF8 "Compile all Windows/MSVC targets with /utf-8." ON)
+option(RAWGL_WINDOWS_PREFIX_ONLY_FIND "Restrict Windows third-party dependency discovery to CMake/package prefix paths and explicit hints." ON)
 set(RAWGL_WINDOWS_DEBUG_SUFFIX "d" CACHE STRING "Suffix applied to Windows Debug target output names.")
 option(RAWGL_BUILD_APP "Build the RawGL command-line application." ON)
 option(RAWGL_BUILD_DOCS "Build Doxygen documentation targets." OFF)
@@ -80,7 +82,12 @@ endfunction()
 
 if(WIN32)
     rawgl_cache_prepend_prefix_path("${RAWGL_WINDOWS_DEPS_ROOT}")
+    if(CMAKE_CONFIGURATION_TYPES AND RAWGL_WINDOWS_CONFIGURATION_TYPES)
+        set(CMAKE_CONFIGURATION_TYPES "${RAWGL_WINDOWS_CONFIGURATION_TYPES}" CACHE STRING "RawGL Windows generator configurations." FORCE)
+    endif()
     set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON CACHE BOOL "Prefer package config files over Find modules on Windows static builds." FORCE)
+    set(CMAKE_FIND_USE_PACKAGE_REGISTRY OFF CACHE BOOL "Do not use the user package registry for RawGL Windows dependency discovery." FORCE)
+    set(CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY OFF CACHE BOOL "Do not use the system package registry for RawGL Windows dependency discovery." FORCE)
     set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release CACHE STRING "Map RelWithDebInfo imports to Release on Windows static builds." FORCE)
     set(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL Release CACHE STRING "Map MinSizeRel imports to Release on Windows static builds." FORCE)
     set(CMAKE_MSVC_RUNTIME_LIBRARY

cmake/rawgl_platform_windows.cmake

@@ -1,9 +1,35 @@
-find_package(OpenGL REQUIRED)
-find_package(ZLIB QUIET)
-
 set(GLEW_USE_STATIC_LIBS ON)
 set(ZLIB_USE_STATIC_LIBS ON)
 
+find_package(OpenGL REQUIRED)
+if(RAWGL_WINDOWS_PREFIX_ONLY_FIND)
+    set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF CACHE BOOL "Do not use PATH/system environment for RawGL Windows dependency discovery." FORCE)
+    set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF CACHE BOOL "Do not use CMake system prefixes for RawGL Windows dependency discovery." FORCE)
+endif()
+find_path(RAWGL_ZLIB_INCLUDE_DIR
+    NAMES zlib.h)
+find_library(RAWGL_ZLIB_LIBRARY_RELEASE
+    NAMES zlibstatic zlib z)
+find_library(RAWGL_ZLIB_LIBRARY_DEBUG
+    NAMES zlibstaticd zlibd zd z_d)
+rawgl_add_windows_imported_library(ZLIB::ZLIBSTATIC
+    INCLUDE_DIR "${RAWGL_ZLIB_INCLUDE_DIR}"
+    RELEASE "${RAWGL_ZLIB_LIBRARY_RELEASE}"
+    DEBUG "${RAWGL_ZLIB_LIBRARY_DEBUG}")
+rawgl_add_windows_imported_library(ZLIB::ZLIB
+    INCLUDE_DIR "${RAWGL_ZLIB_INCLUDE_DIR}"
+    RELEASE "${RAWGL_ZLIB_LIBRARY_RELEASE}"
+    DEBUG "${RAWGL_ZLIB_LIBRARY_DEBUG}")
+if(TARGET ZLIB::ZLIB AND NOT TARGET ZLIB::ZLIBSTATIC)
+    rawgl_add_imported_interface_alias(ZLIB::ZLIBSTATIC ZLIB::ZLIB)
+endif()
+if(NOT TARGET ZLIB::ZLIB)
+    find_package(ZLIB MODULE QUIET)
+endif()
+if(TARGET ZLIB::ZLIB AND NOT TARGET ZLIB::ZLIBSTATIC)
+    rawgl_add_imported_interface_alias(ZLIB::ZLIBSTATIC ZLIB::ZLIB)
+endif()
+
 if(RAWGL_WINDOWS_DEPS_ROOT AND NOT TARGET ZLIB::ZLIB)
     rawgl_add_windows_imported_library(ZLIB::ZLIB
         INCLUDE_DIR "${RAWGL_WINDOWS_DEPS_ROOT}/include"
@@ -124,6 +150,10 @@ find_package(PNG CONFIG QUIET)
 find_package(libjpeg-turbo CONFIG QUIET)
 find_package(JPEG QUIET)
 find_package(TIFF CONFIG QUIET)
+find_package(WebP CONFIG QUIET)
+if(NOT TARGET WebP::webp)
+    find_package(webp CONFIG QUIET)
+endif()
 find_package(GIFLIB CONFIG QUIET)
 if(NOT TARGET GIF::GIF)
     if(TARGET GIFLIB::gif)
@@ -147,6 +177,44 @@ endif()
 find_package(Ptex CONFIG QUIET)
 find_package(OpenJPEG CONFIG QUIET)
 find_package(AOM CONFIG QUIET)
+find_package(Brotli CONFIG QUIET)
+find_package(brotli CONFIG QUIET)
+find_path(RAWGL_BZIP2_INCLUDE_DIR
+    NAMES bzlib.h)
+find_library(RAWGL_BZIP2_LIBRARY_RELEASE
+    NAMES bz2_static bz2 bzip2 libbz2)
+find_library(RAWGL_BZIP2_LIBRARY_DEBUG
+    NAMES bz2_staticd bz2d bzip2d libbz2d bz2_d)
+rawgl_add_windows_imported_library(BZip2::BZip2
+    INCLUDE_DIR "${RAWGL_BZIP2_INCLUDE_DIR}"
+    RELEASE "${RAWGL_BZIP2_LIBRARY_RELEASE}"
+    DEBUG "${RAWGL_BZIP2_LIBRARY_DEBUG}")
+find_path(RAWGL_ICU_INCLUDE_DIR
+    NAMES unicode/utypes.h)
+find_library(RAWGL_ICU_UC_LIBRARY_RELEASE
+    NAMES icuuc)
+find_library(RAWGL_ICU_UC_LIBRARY_DEBUG
+    NAMES icuucd icuuc_d)
+find_library(RAWGL_ICU_I18N_LIBRARY_RELEASE
+    NAMES icuin icui18n)
+find_library(RAWGL_ICU_I18N_LIBRARY_DEBUG
+    NAMES icuind icui18nd icuin_d icui18n_d)
+find_library(RAWGL_ICU_DATA_LIBRARY_RELEASE
+    NAMES icudt icudata)
+find_library(RAWGL_ICU_DATA_LIBRARY_DEBUG
+    NAMES icudtd icudatad icudt_d icudata_d)
+rawgl_add_windows_imported_library(ICU::uc
+    INCLUDE_DIR "${RAWGL_ICU_INCLUDE_DIR}"
+    RELEASE "${RAWGL_ICU_UC_LIBRARY_RELEASE}"
+    DEBUG "${RAWGL_ICU_UC_LIBRARY_DEBUG}")
+rawgl_add_windows_imported_library(ICU::i18n
+    INCLUDE_DIR "${RAWGL_ICU_INCLUDE_DIR}"
+    RELEASE "${RAWGL_ICU_I18N_LIBRARY_RELEASE}"
+    DEBUG "${RAWGL_ICU_I18N_LIBRARY_DEBUG}")
+rawgl_add_windows_imported_library(ICU::data
+    INCLUDE_DIR "${RAWGL_ICU_INCLUDE_DIR}"
+    RELEASE "${RAWGL_ICU_DATA_LIBRARY_RELEASE}"
+    DEBUG "${RAWGL_ICU_DATA_LIBRARY_DEBUG}")
 find_package(harfbuzz CONFIG QUIET)
 find_package(freetype CONFIG QUIET)
 find_package(libheif CONFIG QUIET)
@@ -161,6 +229,12 @@ find_package(pugixml CONFIG QUIET)
 find_package(yaml-cpp CONFIG QUIET)
 find_package(minizip-ng CONFIG QUIET)
 find_package(expat CONFIG QUIET)
+if(NOT TARGET EXPAT::EXPAT)
+    find_package(EXPAT QUIET)
+endif()
+if(TARGET expat::expat AND NOT TARGET EXPAT::EXPAT)
+    rawgl_add_imported_interface_alias(EXPAT::EXPAT expat::expat)
+endif()
 find_package(glew CONFIG QUIET)
 if(NOT TARGET GLEW::GLEW
    AND NOT TARGET GLEW::glew_s
@@ -197,6 +271,17 @@ if(TARGET libjpeg-turbo::jpeg-static AND NOT TARGET JPEG::JPEG)
     set_target_properties(JPEG::JPEG PROPERTIES
         INTERFACE_LINK_LIBRARIES "libjpeg-turbo::jpeg-static")
 endif()
+rawgl_add_imported_interface_alias(WebP::webp WebP::WebP)
+rawgl_add_imported_interface_alias(WebP::webp webp::webp)
+rawgl_add_imported_interface_alias(WebP::webp webp)
+rawgl_add_imported_interface_alias(WebP::webp libwebp)
+rawgl_add_imported_interface_alias(WebP::webp libwebp::webp)
+rawgl_add_imported_interface_alias(WebP::webpdemux webpdemux)
+rawgl_add_imported_interface_alias(WebP::webpdemux libwebpdemux)
+rawgl_add_imported_interface_alias(WebP::webpdemux libwebp::webpdemux)
+rawgl_add_imported_interface_alias(WebP::libwebpmux webpmux)
+rawgl_add_imported_interface_alias(WebP::libwebpmux libwebpmux)
+rawgl_add_imported_interface_alias(WebP::libwebpmux libwebp::webpmux)
 if(TARGET Ptex::Ptex AND NOT TARGET Ptex::Ptex_static)
     add_library(Ptex::Ptex_static ALIAS Ptex::Ptex)
 elseif(TARGET Ptex AND NOT TARGET Ptex::Ptex_static)
@@ -249,6 +334,55 @@ if(NOT TARGET libuhdr::libuhdr
         DEBUG "${RAWGL_WINDOWS_DEPS_ROOT}/lib/uhdrd.lib")
 endif()
 
+if(NOT TARGET WebP::webp)
+    find_path(RAWGL_WEBP_INCLUDE_DIR
+        NAMES webp/decode.h)
+    find_library(RAWGL_WEBP_LIBRARY_RELEASE
+        NAMES webp libwebp)
+    find_library(RAWGL_WEBP_LIBRARY_DEBUG
+        NAMES webpd libwebpd webp_d)
+    rawgl_add_windows_imported_library(WebP::webp
+        INCLUDE_DIR "${RAWGL_WEBP_INCLUDE_DIR}"
+        RELEASE "${RAWGL_WEBP_LIBRARY_RELEASE}"
+        DEBUG "${RAWGL_WEBP_LIBRARY_DEBUG}")
+endif()
+if(NOT TARGET WebP::webpdemux)
+    find_library(RAWGL_WEBPDEMUX_LIBRARY_RELEASE
+        NAMES webpdemux libwebpdemux)
+    find_library(RAWGL_WEBPDEMUX_LIBRARY_DEBUG
+        NAMES webpdemuxd libwebpdemuxd webpdemux_d)
+    rawgl_add_windows_imported_library(WebP::webpdemux
+        INCLUDE_DIR "${RAWGL_WEBP_INCLUDE_DIR}"
+        RELEASE "${RAWGL_WEBPDEMUX_LIBRARY_RELEASE}"
+        DEBUG "${RAWGL_WEBPDEMUX_LIBRARY_DEBUG}")
+endif()
+if(NOT TARGET WebP::libwebpmux)
+    find_library(RAWGL_WEBPMUX_LIBRARY_RELEASE
+        NAMES webpmux libwebpmux)
+    find_library(RAWGL_WEBPMUX_LIBRARY_DEBUG
+        NAMES webpmuxd libwebpmuxd webpmux_d)
+    rawgl_add_windows_imported_library(WebP::libwebpmux
+        INCLUDE_DIR "${RAWGL_WEBP_INCLUDE_DIR}"
+        RELEASE "${RAWGL_WEBPMUX_LIBRARY_RELEASE}"
+        DEBUG "${RAWGL_WEBPMUX_LIBRARY_DEBUG}")
+endif()
+
+rawgl_map_imported_config_targets(
+    GIF::GIF
+    GIFLIB::gif
+    GIFLIB::GIFLIB
+    Brotli::common
+    Brotli::decoder
+    Brotli::encoder
+    Brotli::brotlicommon
+    Brotli::brotlidec
+    Brotli::brotlienc
+    WebP::webp
+    WebP::webpdemux
+    WebP::libwebpmux
+    EXPAT::EXPAT
+    expat::expat)
+
 if(TARGET GLEW::GLEW)
     set(RAWGL_OPENGL_LOADER_TARGET GLEW::GLEW)
 elseif(TARGET GLEW::glew_s)

cmake/rawgl_report.cmake

@@ -86,6 +86,8 @@ function(rawgl_print_config_summary)
     message(STATUS "    RAWGL_BUILD_SPHINX_DOCS: ${RAWGL_BUILD_SPHINX_DOCS}")
     message(STATUS "    RAWGL_DOCS_ONLY: ${RAWGL_DOCS_ONLY}")
     if(WIN32)
+        message(STATUS "    RAWGL_WINDOWS_PREFIX_ONLY_FIND: ${RAWGL_WINDOWS_PREFIX_ONLY_FIND}")
+        message(STATUS "    RAWGL_WINDOWS_CONFIGURATION_TYPES: ${RAWGL_WINDOWS_CONFIGURATION_TYPES}")
         message(STATUS "    RAWGL_WINDOWS_DEBUG_SUFFIX: ${RAWGL_WINDOWS_DEBUG_SUFFIX}")
     endif()
     message(STATUS "    RAWGL_BUILD_PYTHON: ${RAWGL_BUILD_PYTHON}")

cmake/rawgl_targets.cmake

@@ -212,7 +212,8 @@ endif()
 target_link_libraries(rawgl_io PUBLIC
     rawgl_support
     ${RAWGL_OPENGL_LOADER_TARGET}
-    ${RAWGL_OIIO_TARGETS})
+    ${RAWGL_OIIO_TARGETS}
+    ${RAWGL_EXTRA_WINDOWS_LIBS})
 
 if(TARGET PNG::PNG)
     target_link_libraries(rawgl_io PUBLIC PNG::PNG)