mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 22:51:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[rtabmap] Fix link octomap failure (#35278)

Browse Source 
* fix link octomap failure

* update version
This commit is contained in:
jim wang 2023-11-29 16:53:34 +08:00 committed by GitHub
parent ca595d3733
commit 29782549d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ports/rtabmap/fix_link.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/corelib/src/OctoMap.cpp b/corelib/src/OctoMap.cpp
index 8a1e1bb..d7b60da 100644
--- a/corelib/src/OctoMap.cpp
+++ b/corelib/src/OctoMap.cpp
@@ -278,10 +278,8 @@ RtabmapColorOcTree::StaticMemberInitializer::StaticMemberInitializer() {
AbstractOcTree::registerTreeType(tree);
}
-#ifndef _WIN32
// On Windows, the app freezes on start if the following is defined
RtabmapColorOcTree::StaticMemberInitializer RtabmapColorOcTree::RtabmapColorOcTreeMemberInit;
-#endif
//////////////////////////////////////

1
ports/rtabmap/portfile.cmake
View File

@ -8,6 +8,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
fix_autouic.patch
fix_link.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

2
ports/rtabmap/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "rtabmap",
"version": "0.21.0",
"port-version": 2,
"port-version": 3,
"description": "Real-Time Appearance-Based Mapping",
"homepage": "https://introlab.github.io/rtabmap/",
"license": "BSD-3-Clause",

2
versions/baseline.json
View File

@ -7554,7 +7554,7 @@
},
"rtabmap": {
"baseline": "0.21.0",
"port-version": 2
"port-version": 3
},
"rtaudio": {
"baseline": "2021-11-16",

5
versions/r-/rtabmap.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9764edeececed7fb37c356a6e00cb3f983dbf1fb",
"version": "0.21.0",
"port-version": 3
},
{
"git-tree": "63d580588bb49ec2767eed209af0c854cc2d5da2",
"version": "0.21.0",