Fix mujoco in Windows

Multiverse-Framework · Feb 13, 2025 · 059985e · 059985e
1 parent 8d26b08
commit 059985e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/install.bat b/install.bat
@@ -140,7 +140,7 @@ if not exist "%ROS_DIR%" (
 set "MSYS2_DIR=%MULTIVERSE_DIR%\external\msys2"
 if not exist "%MSYS2_DIR%" (
     mkdir "%MSYS2_DIR%"
-    powershell -NoProfile -Command "curl -o '%MSYS2_DIR%\msys2-x86_64-20240507.exe' 'https://github.com/msys2/msys2-installer/releases/download/2024-05-07/msys2-x86_64-20240507.exe'; %MSYS2_DIR%\msys2-x86_64-20240507.exe in --confirm-command --accept-messages --root %MSYS2_DIR%; %MSYS2_DIR%\msys2_shell.cmd -defterm -here -no-start -c 'pacman -y -Syu'"
+    powershell -NoProfile -Command "curl -o '%MSYS2_DIR%\msys2-x86_64-20241208.exe' 'https://github.com/msys2/msys2-installer/releases/download/2024-12-08/msys2-x86_64-20241208.exe'; %MSYS2_DIR%\msys2-x86_64-20241208.exe in --confirm-command --accept-messages --root %MSYS2_DIR%; %MSYS2_DIR%\msys2_shell.cmd -defterm -here -no-start -c 'pacman -y -Syu'"
     powershell -NoProfile -Command "%MSYS2_DIR%\msys2_shell.cmd -defterm -here -no-start -c 'pacman -S mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake mingw-w64-x86_64-zeromq mingw-w64-x86_64-cppzmq mingw-w64-x86_64-jsoncpp mingw-w64-x86_64-boost mingw-w64-x86_64-glfw mingw-w64-x86_64-tinyxml2'"
     powershell -NoProfile -Command "[Environment]::SetEnvironmentVariable('Path', [Environment]::GetEnvironmentVariable('Path', 'User') + ';%MULTIVERSE_DIR%\external\msys2\mingw64\bin', [EnvironmentVariableTarget]::User)"
 )

diff --git a/...src/multiverse_simulators/src/mujoco_connector/plugin/multiverse_connector/CMakeLists.txt b/...src/multiverse_simulators/src/mujoco_connector/plugin/multiverse_connector/CMakeLists.txt
@@ -1,10 +1,6 @@
-if(WIN32)
-    find_package(cppzmq REQUIRED)
-    find_package(jsoncpp REQUIRED)
-endif()
-
-set(MUJOCO_MULTIVERSE_CONNECTOR_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/../..
-                            ${CMAKE_CURRENT_SOURCE_DIR}/../../src
+set(MUJOCO_MULTIVERSE_CONNECTOR_INCLUDE 
+  ${CMAKE_CURRENT_SOURCE_DIR}/../..
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../src
 )
 
 if (UNIX)
@@ -37,8 +33,6 @@ if (UNIX)
 elseif (WIN32)
   target_link_libraries(multiverse_connector PRIVATE 
     mujoco
-    JsonCpp::JsonCpp
-    cppzmq
   )
 endif()
 target_compile_options(