From dc1e05409b7b57da4e1f2561ccbf9363939d534f Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Tue, 12 Nov 2024 12:37:39 +0200 Subject: [PATCH] fixing libpng cmake --- externals/CMakeLists.txt | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 0d00a078c..c6ffa12dd 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -58,8 +58,10 @@ if (NOT TARGET zlib-ng::zlib) set(WITH_GTEST OFF) set(WITH_NEW_STRATEGIES ON) set(WITH_NATIVE_INSTRUCTIONS ON) + set(ZLIB_COMPAT OFF CACHE BOOL "" FORCE) add_subdirectory(zlib-ng) add_library(zlib-ng::zlib ALIAS zlib) + add_library(ZLIB::ZLIB ALIAS zlib) endif() # SDL3 @@ -154,22 +156,16 @@ if (NOT TARGET half::half) endif() # libpng -set(PNG_SHARED ON CACHE BOOL "" FORCE) -set(PNG_STATIC OFF CACHE BOOL "" FORCE) -set(PNG_EXECUTABLES OFF CACHE BOOL "" FORCE) +set(PNG_SHARED OFF CACHE BOOL "" FORCE) +set(PNG_STATIC ON CACHE BOOL "" FORCE) set(PNG_TESTS OFF CACHE BOOL "" FORCE) set(PNG_TOOLS 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 STRING "${INSTALL_DIR}/include" FORCE) - -include_directories(libpng) -# generated files from libpng during build -include_directories(${CMAKE_CURRENT_BINARY_DIR}/libpng) - +set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/zlib-ng" CACHE STRING "" 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\"") add_subdirectory(libpng) - if (APPLE) # date if (NOT TARGET date::date-tz)