From 99e626096f2280faeaeeba41ac29636bb1eef62b Mon Sep 17 00:00:00 2001
From: Saran Tunyasuvunakool <stunya@google.com>
Date: Tue, 12 May 2026 15:50:48 -0700
Subject: [PATCH] Fix miniz include.

PiperOrigin-RevId: 914519929
Change-Id: I0dc00ef3f4518571165e4be0e85016511e0cdd60
---
 cmake/MujocoDependencies.cmake | 20 ++++++++++++++++----
 src/xml/mjz/mjz_decoder.cc     | 15 ++++++++++++++-
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake
index eaf8e51b..a6a0a4ca 100644
--- a/cmake/MujocoDependencies.cmake
+++ b/cmake/MujocoDependencies.cmake
@@ -247,13 +247,25 @@ if(WIN32)
   endif()
 endif()
 
+if(DEFINED BUILD_TESTS)
+  set(_OLD_BUILD_TESTS "${BUILD_TESTS}")
+  set(_BUILD_TESTS_WAS_DEFINED TRUE)
+else()
+  set(_BUILD_TESTS_WAS_DEFINED FALSE)
+endif()
 set(BUILD_TESTS OFF)
 fetchpackage(
-    PACKAGE_NAME  miniz
-    GIT_REPO      https://github.com/richgel999/miniz.git
-    GIT_TAG       ${MUJOCO_DEP_VERSION_miniz}
-    TARGETS       miniz
+  PACKAGE_NAME  miniz
+  GIT_REPO      https://github.com/richgel999/miniz.git
+  GIT_TAG       ${MUJOCO_DEP_VERSION_miniz}
+  TARGETS       miniz
 )
+if(_BUILD_TESTS_WAS_DEFINED)
+  set(BUILD_TESTS "${_OLD_BUILD_TESTS}")
+else()
+  unset(BUILD_TESTS)
+endif()
+unset(_BUILD_TESTS_WAS_DEFINED)
 
 
 if(MUJOCO_BUILD_TESTS OR MUJOCO_BUILD_STUDIO OR MUJOCO_USE_FILAMENT)
diff --git a/src/xml/mjz/mjz_decoder.cc b/src/xml/mjz/mjz_decoder.cc
index 12fc0ba5..f2864518 100644
--- a/src/xml/mjz/mjz_decoder.cc
+++ b/src/xml/mjz/mjz_decoder.cc
@@ -24,7 +24,20 @@
 #include <utility>
 #include <vector>
 
-#include <miniz_zip.h>
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-function"
+#elif defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+#include <miniz.h>
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#elif defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
+
 #include <mujoco/mjspec.h>
 #include <mujoco/mujoco.h>
 #include "user/user_resource.h"