Put miniz in MujocoDependencies.cmake.
PiperOrigin-RevId: 914322421 Change-Id: I3f6e821164eede979802c51a6f8ee00d3346d585
This commit is contained in:
committed by
Copybara-Service
parent
58abf3d4ae
commit
7f5be412a0
@@ -38,6 +38,10 @@ set(MUJOCO_DEP_VERSION_qhull
|
||||
62ccc56af071eaa478bef6ed41fd7a55d3bb2d80
|
||||
CACHE STRING "Version of `qhull` to be fetched."
|
||||
)
|
||||
set(MUJOCO_DEP_VERSION_miniz
|
||||
3.1.1
|
||||
CACHE STRING "Version of `miniz` to be fetched."
|
||||
)
|
||||
set(MUJOCO_DEP_VERSION_Eigen3
|
||||
ea13a98decd497a8c5588fb5de71b57bcf10d864
|
||||
CACHE STRING "Version of `Eigen3` to be fetched."
|
||||
@@ -243,6 +247,15 @@ if(WIN32)
|
||||
endif()
|
||||
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
|
||||
)
|
||||
|
||||
|
||||
if(MUJOCO_BUILD_TESTS OR MUJOCO_BUILD_STUDIO OR MUJOCO_USE_FILAMENT)
|
||||
set(ABSL_PROPAGATE_CXX_STD ON)
|
||||
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
# Copyright 2026 DeepMind Technologies Limited
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
set(MUJOCO_DEP_VERSION_miniz
|
||||
2.1.0
|
||||
CACHE STRING "Tag/version of `miniz` to be fetched."
|
||||
)
|
||||
mark_as_advanced(MUJOCO_DEP_VERSION_miniz)
|
||||
|
||||
include(FindOrFetch)
|
||||
|
||||
fetchpackage(
|
||||
PACKAGE_NAME miniz
|
||||
GIT_REPO https://github.com/richgel999/miniz.git
|
||||
GIT_TAG ${MUJOCO_DEP_VERSION_miniz}
|
||||
TARGETS miniz
|
||||
CUSTOM_CMAKE "${CMAKE_SOURCE_DIR}/cmake/third_party_deps/miniz/CMakeLists.txt"
|
||||
)
|
||||
@@ -1,22 +0,0 @@
|
||||
# Copyright 2026 DeepMind Technologies Limited
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
|
||||
PROJECT(miniz C)
|
||||
|
||||
set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c)
|
||||
add_library(miniz STATIC ${miniz_SOURCE})
|
||||
|
||||
target_include_directories(miniz PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
@@ -11,7 +11,6 @@
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
include(third_party_deps/miniz)
|
||||
|
||||
set(MUJOCO_MJZ_SRCS
|
||||
mjz_decoder.cc
|
||||
|
||||
Reference in New Issue
Block a user