chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #636 from traversaro:fixextglfw

Browse Source 
PiperOrigin-RevId: 507618773
Change-Id: I74362535e9840c97b7c4c3fbff29e06bcdcaf41a
This commit is contained in:
Copybara-Service
2023-02-06 16:50:54 -08:00
parent 6b80b010af ca70d8bfaf
commit 36836d8e42
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sample/cmake/SampleDependencies.cmake
+5 -5
View File
@@ -29,11 +29,11 @@ unset(DEFAULT_USE_SYSTEM_MUJOCO)
option(MUJOCO_SAMPLES_USE_SYSTEM_MUJOCO "Use installed MuJoCo version." OFF) option(MUJOCO_SAMPLES_USE_SYSTEM_MUJOCO "Use installed MuJoCo version." OFF)
option(MUJOCO_SAMPLES_USE_SYSTEM_GLFW "Use installed GLFW version." OFF) option(MUJOCO_SAMPLES_USE_SYSTEM_GLFW "Use installed GLFW version." OFF)
set(MUJOCO_DEP_VERSION_glfw set(MUJOCO_DEP_VERSION_glfw3
7482de6071d21db77a7236155da44c172a7f6c9e # 3.3.8 7482de6071d21db77a7236155da44c172a7f6c9e # 3.3.8
CACHE STRING "Version of `glfw` to be fetched." CACHE STRING "Version of `glfw` to be fetched."
) )
mark_as_advanced(MUJOCO_DEP_VERSION_glfw) mark_as_advanced(MUJOCO_DEP_VERSION_glfw3)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
@@ -78,13 +78,13 @@ findorfetch(
USE_SYSTEM_PACKAGE USE_SYSTEM_PACKAGE
MUJOCO_SAMPLES_USE_SYSTEM_GLFW MUJOCO_SAMPLES_USE_SYSTEM_GLFW
PACKAGE_NAME PACKAGE_NAME
glfw glfw3
LIBRARY_NAME LIBRARY_NAME
glfw glfw3
GIT_REPO GIT_REPO
https://github.com/glfw/glfw.git https://github.com/glfw/glfw.git
GIT_TAG GIT_TAG
${MUJOCO_DEP_VERSION_glfw} ${MUJOCO_DEP_VERSION_glfw3}
TARGETS TARGETS
glfw glfw
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
simulate/cmake/SimulateDependencies.cmake
+5 -5
View File
@@ -29,11 +29,11 @@ unset(DEFAULT_USE_SYSTEM_MUJOCO)
option(MUJOCO_SIMULATE_USE_SYSTEM_MUJOCO "Use installed MuJoCo version." OFF) option(MUJOCO_SIMULATE_USE_SYSTEM_MUJOCO "Use installed MuJoCo version." OFF)
option(MUJOCO_SIMULATE_USE_SYSTEM_GLFW "Use installed GLFW version." OFF) option(MUJOCO_SIMULATE_USE_SYSTEM_GLFW "Use installed GLFW version." OFF)
set(MUJOCO_DEP_VERSION_glfw set(MUJOCO_DEP_VERSION_glfw3
7482de6071d21db77a7236155da44c172a7f6c9e # 3.3.8 7482de6071d21db77a7236155da44c172a7f6c9e # 3.3.8
CACHE STRING "Version of `glfw` to be fetched." CACHE STRING "Version of `glfw` to be fetched."
) )
mark_as_advanced(MUJOCO_DEP_VERSION_glfw) mark_as_advanced(MUJOCO_DEP_VERSION_glfw3)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
@@ -78,13 +78,13 @@ findorfetch(
USE_SYSTEM_PACKAGE USE_SYSTEM_PACKAGE
MUJOCO_SIMULATE_USE_SYSTEM_GLFW MUJOCO_SIMULATE_USE_SYSTEM_GLFW
PACKAGE_NAME PACKAGE_NAME
glfw glfw3
LIBRARY_NAME LIBRARY_NAME
glfw glfw3
GIT_REPO GIT_REPO
https://github.com/glfw/glfw.git https://github.com/glfw/glfw.git
GIT_TAG GIT_TAG
${MUJOCO_DEP_VERSION_glfw} ${MUJOCO_DEP_VERSION_glfw3}
TARGETS TARGETS
glfw glfw
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL