fixing libpng cmake

This commit is contained in:
georgemoralis 2024-11-12 12:37:39 +02:00
parent 180f1ff97d
commit dc1e05409b

View File

@ -58,8 +58,10 @@ if (NOT TARGET zlib-ng::zlib)
set(WITH_GTEST OFF) set(WITH_GTEST OFF)
set(WITH_NEW_STRATEGIES ON) set(WITH_NEW_STRATEGIES ON)
set(WITH_NATIVE_INSTRUCTIONS ON) set(WITH_NATIVE_INSTRUCTIONS ON)
set(ZLIB_COMPAT OFF CACHE BOOL "" FORCE)
add_subdirectory(zlib-ng) add_subdirectory(zlib-ng)
add_library(zlib-ng::zlib ALIAS zlib) add_library(zlib-ng::zlib ALIAS zlib)
add_library(ZLIB::ZLIB ALIAS zlib)
endif() endif()
# SDL3 # SDL3
@ -154,22 +156,16 @@ if (NOT TARGET half::half)
endif() endif()
# libpng # libpng
set(PNG_SHARED ON CACHE BOOL "" FORCE) set(PNG_SHARED OFF CACHE BOOL "" FORCE)
set(PNG_STATIC OFF CACHE BOOL "" FORCE) set(PNG_STATIC ON CACHE BOOL "" FORCE)
set(PNG_EXECUTABLES OFF CACHE BOOL "" FORCE)
set(PNG_TESTS OFF CACHE BOOL "" FORCE) set(PNG_TESTS OFF CACHE BOOL "" FORCE)
set(PNG_TOOLS OFF CACHE BOOL "" FORCE) set(PNG_TOOLS OFF CACHE BOOL "" FORCE)
set(SKIP_INSTALL_ALL OFF CACHE BOOL "" FORCE) set(SKIP_INSTALL_ALL OFF CACHE BOOL "" FORCE)
set(ZLIB_LIBRARY STRING "${INSTALL_DIR}/lib/zlib-ng.lib" FORCE) set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/zlib-ng" CACHE STRING "" FORCE)
set(ZLIB_INCLUDE_DIR STRING "${INSTALL_DIR}/include" FORCE) set(ZLIB_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/zlib-ng/zlibstatic-ngd" CACHE STRING "" FORCE)
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libpng/zlib.h" "#include \"../zlib-ng/zlib.h\"")
include_directories(libpng)
# generated files from libpng during build
include_directories(${CMAKE_CURRENT_BINARY_DIR}/libpng)
add_subdirectory(libpng) add_subdirectory(libpng)
if (APPLE) if (APPLE)
# date # date
if (NOT TARGET date::date-tz) if (NOT TARGET date::date-tz)