From 72a67a1677cb52641e9ea0465c37edc20c0be50f Mon Sep 17 00:00:00 2001 From: Mathieu Cayeux Date: Mon, 29 Jan 2024 12:29:43 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9D=20Fixed=20ZLib=20shit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt index 7a17f362..949e3137 100644 --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -12,6 +12,10 @@ add_subdirectory(rapidjson/) add_subdirectory(zlib/) +# Fixing ZLib shit because we are doing a submodule install, and it is annoying to +# have a dirty git tree just because of one file +file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h.included ${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h) + add_subdirectory(openssl/) set(BUILD_STATIC_LIBS ON CACHE BOOL "" FORCE) @@ -24,5 +28,5 @@ set(LUABRIDGE_TESTING ON CACHE BOOL "" FORCE) add_subdirectory(LuaBridge3/) target_link_libraries(mineserver-libs PUBLIC crypto ssl zlibstatic lua::lib LuaBridge) -target_include_directories(mineserver-libs PUBLIC rapidjson/include zlib) +target_include_directories(mineserver-libs PUBLIC rapidjson/include zlibstatic) target_compile_options(mineserver-libs PUBLIC -w)