mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-20 08:59:32 +03:00
b647155e5b
* mujoco: init at 2.3.0 * mujoco: refactor `meta` Co-authored-by: Florian <florian.brandes@posteo.de> Co-authored-by: Florian <florian.brandes@posteo.de>
115 lines
2.7 KiB
Diff
115 lines
2.7 KiB
Diff
diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake
|
|
index 99e4a7a..cf9a901 100644
|
|
--- a/cmake/MujocoDependencies.cmake
|
|
+++ b/cmake/MujocoDependencies.cmake
|
|
@@ -82,8 +82,6 @@ set(BUILD_SHARED_LIBS
|
|
if(NOT TARGET lodepng)
|
|
FetchContent_Declare(
|
|
lodepng
|
|
- GIT_REPOSITORY https://github.com/lvandeve/lodepng.git
|
|
- GIT_TAG ${MUJOCO_DEP_VERSION_lodepng}
|
|
)
|
|
|
|
FetchContent_GetProperties(lodepng)
|
|
@@ -111,10 +109,6 @@ findorfetch(
|
|
qhull
|
|
LIBRARY_NAME
|
|
qhull
|
|
- GIT_REPO
|
|
- https://github.com/qhull/qhull.git
|
|
- GIT_TAG
|
|
- ${MUJOCO_DEP_VERSION_qhull}
|
|
TARGETS
|
|
qhull
|
|
# TODO(fraromano) Remove when https://github.com/qhull/qhull/pull/112 is merged.
|
|
@@ -146,10 +140,6 @@ findorfetch(
|
|
tinyxml2
|
|
LIBRARY_NAME
|
|
tinyxml2
|
|
- GIT_REPO
|
|
- https://github.com/leethomason/tinyxml2.git
|
|
- GIT_TAG
|
|
- ${MUJOCO_DEP_VERSION_tinyxml2}
|
|
TARGETS
|
|
tinyxml2
|
|
EXCLUDE_FROM_ALL
|
|
@@ -164,10 +154,6 @@ findorfetch(
|
|
tinyobjloader
|
|
LIBRARY_NAME
|
|
tinyobjloader
|
|
- GIT_REPO
|
|
- https://github.com/tinyobjloader/tinyobjloader.git
|
|
- GIT_TAG
|
|
- ${MUJOCO_DEP_VERSION_tinyobjloader}
|
|
TARGETS
|
|
tinyobjloader
|
|
EXCLUDE_FROM_ALL
|
|
@@ -182,10 +168,6 @@ findorfetch(
|
|
ccd
|
|
LIBRARY_NAME
|
|
ccd
|
|
- GIT_REPO
|
|
- https://github.com/danfis/libccd.git
|
|
- GIT_TAG
|
|
- ${MUJOCO_DEP_VERSION_ccd}
|
|
TARGETS
|
|
ccd
|
|
EXCLUDE_FROM_ALL
|
|
@@ -222,10 +204,6 @@ if(MUJOCO_BUILD_TESTS)
|
|
absl
|
|
LIBRARY_NAME
|
|
abseil-cpp
|
|
- GIT_REPO
|
|
- https://github.com/abseil/abseil-cpp.git
|
|
- GIT_TAG
|
|
- ${MUJOCO_DEP_VERSION_abseil}
|
|
TARGETS
|
|
absl::core_headers
|
|
EXCLUDE_FROM_ALL
|
|
@@ -249,10 +227,6 @@ if(MUJOCO_BUILD_TESTS)
|
|
GTest
|
|
LIBRARY_NAME
|
|
googletest
|
|
- GIT_REPO
|
|
- https://github.com/google/googletest.git
|
|
- GIT_TAG
|
|
- ${MUJOCO_DEP_VERSION_gtest}
|
|
TARGETS
|
|
gtest
|
|
gmock
|
|
@@ -283,10 +257,6 @@ if(MUJOCO_BUILD_TESTS)
|
|
benchmark
|
|
LIBRARY_NAME
|
|
benchmark
|
|
- GIT_REPO
|
|
- https://github.com/google/benchmark.git
|
|
- GIT_TAG
|
|
- ${MUJOCO_DEP_VERSION_benchmark}
|
|
TARGETS
|
|
benchmark::benchmark
|
|
benchmark::benchmark_main
|
|
@@ -303,8 +273,6 @@ if(MUJOCO_TEST_PYTHON_UTIL)
|
|
|
|
FetchContent_Declare(
|
|
Eigen3
|
|
- GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
|
|
- GIT_TAG ${MUJOCO_DEP_VERSION_Eigen3}
|
|
)
|
|
|
|
FetchContent_GetProperties(Eigen3)
|
|
diff --git a/simulate/cmake/SimulateDependencies.cmake b/simulate/cmake/SimulateDependencies.cmake
|
|
index 6616d6f..5d5a889 100644
|
|
--- a/simulate/cmake/SimulateDependencies.cmake
|
|
+++ b/simulate/cmake/SimulateDependencies.cmake
|
|
@@ -81,10 +81,6 @@ findorfetch(
|
|
glfw
|
|
LIBRARY_NAME
|
|
glfw
|
|
- GIT_REPO
|
|
- https://github.com/glfw/glfw.git
|
|
- GIT_TAG
|
|
- ${MUJOCO_DEP_VERSION_glfw}
|
|
TARGETS
|
|
glfw
|
|
EXCLUDE_FROM_ALL
|