From afb9ddb42e1d656e04b6729d06bea8ec9b09c8b2 Mon Sep 17 00:00:00 2001 From: sowle Date: Sun, 13 Apr 2025 19:06:52 +0300 Subject: [PATCH] zlib: minor improvements for build/cmake see also: https://github.com/madler/zlib/issues/781 see also: https://github.com/madler/zlib/blob/cacf7f1d4e3d44d871b605da3b647f07d718623f/CMakeLists.txt#L69 --- contrib/CMakeLists.txt | 4 ++++ contrib/zlib/{zconf.h => zconf.h.included} | 0 2 files changed, 4 insertions(+) rename contrib/zlib/{zconf.h => zconf.h.included} (100%) diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 842f905c..dcbae4fa 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -1,7 +1,10 @@ set(UPNPC_BUILD_STATIC ON CACHE BOOL "Build static library") set(UPNPC_BUILD_SHARED OFF CACHE BOOL "Build shared library") set(UPNPC_BUILD_TESTS OFF CACHE BOOL "Build test executables") + +set(ZLIB_BUILD_EXAMPLES OFF CACHE INTERNAL "" FORCE) add_subdirectory(zlib) + add_subdirectory(db) add_subdirectory(ethereum) @@ -37,6 +40,7 @@ add_subdirectory(miniupnp/miniupnpc) set_property(TARGET libminiupnpc-static PROPERTY FOLDER "contrib") +set_property(TARGET zlib PROPERTY FOLDER "contrib") set_property(TARGET zlibstatic PROPERTY FOLDER "contrib") set_property(TARGET mdbx PROPERTY FOLDER "contrib") set_property(TARGET lmdb PROPERTY FOLDER "contrib") diff --git a/contrib/zlib/zconf.h b/contrib/zlib/zconf.h.included similarity index 100% rename from contrib/zlib/zconf.h rename to contrib/zlib/zconf.h.included