From 57cbecc4191e8b49c2eccb0b2e7576617962785d Mon Sep 17 00:00:00 2001 From: Sasha Szpakowski Date: Fri, 20 Dec 2024 11:47:35 -0400 Subject: [PATCH] Re-apply Megasource-specific CMake patches to zlib. --- CMakeLists.txt | 1 + libs/zlib-1.3.1/CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ed4d08af..97cd4abf 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -242,6 +242,7 @@ set(OGG_LIBRARY ogg-static) message(STATUS "-----------------------------------------------------") message(STATUS "Configuring: zlib ${MEGA_ZLIB_VER}") message(STATUS "-----------------------------------------------------") +set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "Enable Zlib Examples" FORCE) add_subdirectory("libs/zlib-${MEGA_ZLIB_VER}" ${CMAKE_BINARY_DIR}/zlib) set(MEGA_ZLIB zlibstatic) diff --git a/libs/zlib-1.3.1/CMakeLists.txt b/libs/zlib-1.3.1/CMakeLists.txt index 15ceebe7..109f1dca 100644 --- a/libs/zlib-1.3.1/CMakeLists.txt +++ b/libs/zlib-1.3.1/CMakeLists.txt @@ -155,6 +155,10 @@ add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HD target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) set_target_properties(zlib PROPERTIES SOVERSION 1) +target_include_directories(zlib PUBLIC .) +target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(zlibstatic PUBLIC .) +target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) if(NOT CYGWIN) # This property causes shared libraries on Linux to have the full version