Skip to content

Commit

Permalink
- Fix "ff_pw_9' can not be used when making a shared object; recompil…
Browse files Browse the repository at this point in the history
…e with -fPIC"

- Update ignition-msgs5 to 5.11.0
  • Loading branch information
talregev committed Feb 7, 2024
1 parent 9e11298 commit db69dd4
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 0 deletions.
13 changes: 13 additions & 0 deletions deps/vcpkg/ports/ignition-msgs5/01-protobuf.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f68bf3d..d4d1372 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -135,6 +135,8 @@ if(MSVC)
# warning is not important since those members do not need to be interfaced
# with.
set_source_files_properties(${gen_sources} COMPILE_FLAGS "/wd4251 /wd4146")
+ # Fix for protobuf 3.12 - allow big object files
+ add_definitions(/bigobj)
endif()

set_source_files_properties(${gen_headers} ${gen_sources} ${gen_ruby_scripts}
9 changes: 9 additions & 0 deletions deps/vcpkg/ports/ignition-msgs5/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Cross-compilation is disabled until the upstream discussion
# https://github.com/ignitionrobotics/ign-msgs/issues/34 is solved

ignition_modular_library(NAME msgs
VERSION ${VERSION}
SHA512 bbd71339c816947cbf91778303c4370e3d03b068421f0a043de3462d5eb691b16cbc3d19804cb353ad03f78f3e187af366e9d950fa05ebf22d0d08c565748bc4
PATCHES
"01-protobuf.patch"
)
17 changes: 17 additions & 0 deletions deps/vcpkg/ports/ignition-msgs5/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "ignition-msgs5",
"version": "5.11.0",
"description": "Middleware protobuf messages for robotics",
"license": "Apache-2.0",
"supports": "!(arm | uwp)",
"dependencies": [
"ignition-cmake2",
"ignition-math6",
{
"name": "ignition-modularscripts",
"host": true
},
"protobuf",
"tinyxml2"
]
}
4 changes: 4 additions & 0 deletions deps/vcpkg/triplets/x64-linux-release.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ set(VCPKG_LIBRARY_LINKAGE static)

set(VCPKG_CMAKE_SYSTEM_NAME Linux)
set(VCPKG_BUILD_TYPE release)

if(PORT STREQUAL "ffmpeg")
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()

0 comments on commit db69dd4

Please sign in to comment.