Merge pull request #874 from mavlink/fix-zlib-patch

zlib: use nicer patch to install cmake config
mavlink · Nov 4, 2019 · 4c558ee · 4c558ee
2 parents 5fdbbad + 04cab3d
commit 4c558ee
Show file tree

Hide file tree

Showing 3 changed files with 313 additions and 91 deletions.
diff --git a/third_party/zlib/CMakeLists.txt b/third_party/zlib/CMakeLists.txt
@@ -18,7 +18,9 @@ ExternalProject_add(
     zlib
     GIT_REPOSITORY https://github.com/madler/zlib
     GIT_TAG v1.2.11
-    PREFIX zlib
-    PATCH_COMMAND git apply ${PROJECT_SOURCE_DIR}/build_shared_libs.patch
+    # Patch taken from: https://github.com/madler/zlib/pull/337/files
+    # Thanks to @Mizux
+    PATCH_COMMAND git apply ${PROJECT_SOURCE_DIR}/pr-337-cmake-update.patch
     CMAKE_ARGS "${CMAKE_ARGS}"
     )
+
diff --git a/third_party/zlib/build_shared_libs.patch b/third_party/zlib/build_shared_libs.patch