Browse Source

Re-apply Megasource-specific CMake patches to zlib.

Miku AuahDark 3 years ago
parent
commit
b6b41a6576
1 changed files with 6 additions and 0 deletions
  1. 6 0
      libs/zlib-1.2.12/CMakeLists.txt

+ 6 - 0
libs/zlib-1.2.12/CMakeLists.txt

@@ -187,6 +187,10 @@ add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC
 add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
 add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
 set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
 set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
 set_target_properties(zlib PROPERTIES SOVERSION 1)
 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)
 if(NOT CYGWIN)
     # This property causes shared libraries on Linux to have the full version
     # This property causes shared libraries on Linux to have the full version
@@ -230,6 +234,8 @@ endif()
 # Example binaries
 # Example binaries
 #============================================================================
 #============================================================================
 
 
+return()
+
 add_executable(example test/example.c)
 add_executable(example test/example.c)
 target_link_libraries(example zlib)
 target_link_libraries(example zlib)
 add_test(example example)
 add_test(example example)