Revert "Rework zlib patching"

This reverts commit c2aabae.
BRL-CAD · Oct 15, 2024 · d8f6d03 · d8f6d03
1 parent 0820e71
commit d8f6d03
Show file tree

Hide file tree

Showing 5 changed files with 5,054 additions and 683 deletions.
diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
@@ -19,11 +19,7 @@ if (ENABLE_ZLIB)
   ExternalProject_Add(ZLIB_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/zlib"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
-    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/zlib_cmake.patch
-    COMMAND ${CMAKE_COMMAND};-E;rename;<SOURCE_DIR>/zlib.h;<SOURCE_DIR>/zlib.h.in
-    COMMAND ${CMAKE_COMMAND};-E;rename;<SOURCE_DIR>/zconf.h;<SOURCE_DIR>/zconf.h.in
-    COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/zlib_rc.patch
-    COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/zlib_prefix.patch
+    PATCH_COMMAND ${PATCH_EXECUTABLE};-E;-p1;${PATCH_OPTIONS};-i;${CMAKE_CURRENT_SOURCE_DIR}/zlib.patch
     CMAKE_ARGS
     ${BUILD_TYPE_SPECIFIER}
     -DZ_PREFIX_STR=${Z_PREFIX_STR}