zlib...

Author: LimitlessGreen

src/CMakeLists.txt

@@ -185,7 +185,10 @@ set(ZLIB_LIBRARIES zlibstatic CACHE STRING "" FORCE)
 
 # Create ZLIB::ZLIB alias target pointing to the actual zlibstatic target
 # This lets CMake handle the actual library path and build dependencies automatically
-add_library(ZLIB::ZLIB ALIAS zlibstatic)
+# Only create the alias if zlibstatic target exists (i.e., we're using bundled zlib)
+if(TARGET zlibstatic)
+    add_library(ZLIB::ZLIB ALIAS zlibstatic)
+endif()
 
 # Bundled libarchive
 set(ENABLE_WERROR OFF CACHE BOOL "")
@@ -687,9 +690,21 @@ else()
     install(FILES icons/openhdimagewriter.png DESTINATION share/pixmaps)
 endif()
 
-add_dependencies(${PROJECT_NAME} ZLIB::ZLIB)
+# Add dependency on ZLIB only if we're using bundled zlib
+if(TARGET ZLIB::ZLIB)
+    add_dependencies(${PROJECT_NAME} ZLIB::ZLIB)
+endif()
 include_directories(${CURL_INCLUDE_DIR} ${LibArchive_INCLUDE_DIR} ${LIBLZMA_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${ZSTD_INCLUDE_DIR})
 
+# Set up ZLIB library variable for linking
+if(TARGET ZLIB::ZLIB)
+    set(ZLIB_LINK_TARGET ZLIB::ZLIB)
+else()
+    # Use system zlib via FindZLIB results
+    find_package(ZLIB REQUIRED)
+    set(ZLIB_LINK_TARGET ${ZLIB_LIBRARIES})
+endif()
+
 if(WIN32)
     # Maximum static linking for MinGW to minimize external dependencies
     if(CMAKE_COMPILER_IS_GNUCXX)
@@ -699,7 +714,7 @@ if(WIN32)
         # Prefer static libraries on Windows
         set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ".lib" ".dll.a")
     endif()
-    target_link_libraries(${PROJECT_NAME} PRIVATE ${QT}::Core ${QT}::Quick ${QT}::Svg ${CURL_LIBRARIES} ${LibArchive_LIBRARIES} ${ZSTD_LIBRARIES} ${LIBLZMA_LIBRARIES} ZLIB::ZLIB ${ATOMIC_LIBRARY} ${EXTRALIBS} crypt32 secur32 bcrypt)
+    target_link_libraries(${PROJECT_NAME} PRIVATE ${QT}::Core ${QT}::Quick ${QT}::Svg ${CURL_LIBRARIES} ${LibArchive_LIBRARIES} ${ZSTD_LIBRARIES} ${LIBLZMA_LIBRARIES} ${ZLIB_LINK_TARGET} ${ATOMIC_LIBRARY} ${EXTRALIBS} crypt32 secur32 bcrypt)
 else()
-    target_link_libraries(${PROJECT_NAME} PRIVATE ${QT}::Core ${QT}::Quick ${QT}::Svg ${CURL_LIBRARIES} ${LibArchive_LIBRARIES} ${ZSTD_LIBRARIES} ${LIBLZMA_LIBRARIES} ZLIB::ZLIB ${ATOMIC_LIBRARY} ${EXTRALIBS})
+    target_link_libraries(${PROJECT_NAME} PRIVATE ${QT}::Core ${QT}::Quick ${QT}::Svg ${CURL_LIBRARIES} ${LibArchive_LIBRARIES} ${ZSTD_LIBRARIES} ${LIBLZMA_LIBRARIES} ${ZLIB_LINK_TARGET} ${ATOMIC_LIBRARY} ${EXTRALIBS})
 endif()