Skip to content

Commit

Permalink
Add patch for MSVC2022 compilation and bump port-version
Browse files Browse the repository at this point in the history
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
  • Loading branch information
j-rivero committed Mar 21, 2023
1 parent ecc6d26 commit d914d36
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 3 deletions.
27 changes: 27 additions & 0 deletions dartsim/fix_msvc2022_compilation.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Title: Fix compilation with MSVC 2022
Source: Michael Carroll <mjcarroll@intrinsic.ai>
Description: Patch type to make MSVC2022 to be able to compile

---
diff --git a/dart/common/detail/Signal.hpp b/dart/common/detail/Signal.hpp
index b7a6744d8ed1..844952e27bdd 100644
--- a/dart/common/detail/Signal.hpp
+++ b/dart/common/detail/Signal.hpp
@@ -84,7 +84,7 @@ void Signal<_Res(_ArgTypes...), Combiner>::disconnect(
//==============================================================================
template <typename _Res, typename... _ArgTypes, template <class> class Combiner>
void Signal<_Res(_ArgTypes...), Combiner>::disconnect(
- const std::shared_ptr<Signal::ConnectionBodyType>& connectionBody)
+ const std::shared_ptr<ConnectionBodyType>& connectionBody)
{
mConnectionBodies.erase(connectionBody);
}
@@ -179,7 +179,7 @@ void Signal<void(_ArgTypes...)>::disconnect(const Connection& connection) const
//==============================================================================
template <typename... _ArgTypes>
void Signal<void(_ArgTypes...)>::disconnect(
- const std::shared_ptr<Signal::ConnectionBodyType>& connectionBody)
+ const std::shared_ptr<ConnectionBodyType>& connectionBody)
{
mConnectionBodies.erase(connectionBody);
}
2 changes: 1 addition & 1 deletion dartsim/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Shared library support is broken upstream (https://github.com/dartsim/dart/issues/1005#issuecomment-375406260)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
Expand All @@ -9,6 +8,7 @@ vcpkg_from_github(
HEAD_REF main
PATCHES
disable_unit_tests_examples_and_tutorials.patch
fix_msvc2022_compilation.patch
)

vcpkg_cmake_configure(
Expand Down
4 changes: 2 additions & 2 deletions dartsim/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "dartsim",
"version": "6.11.0",
"port-version": 3,
"description": "Dynamic Animation and Robotics Toolkit",
"port-version": 4,
"description": "Dynamic Animation and Robotics Toolkit. OpenRobotics patched",
"homepage": "https://dartsim.github.io/",
"dependencies": [
"assimp",
Expand Down

0 comments on commit d914d36

Please sign in to comment.