Browse Source

Re-apply Megasource-specific CMake patches to zlib.

Sasha Szpakowski 11 months ago
parent
commit
57cbecc419
2 changed files with 5 additions and 0 deletions
  1. 1 0
      CMakeLists.txt
  2. 4 0
      libs/zlib-1.3.1/CMakeLists.txt

+ 1 - 0
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)
 

+ 4 - 0
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