-
Notifications
You must be signed in to change notification settings - Fork 494
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Fix "ff_pw_9' can not be used when making a shared object; recompil…
…e with -fPIC" - Update ignition-msgs5 to 5.11.0
- Loading branch information
Showing
4 changed files
with
43 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters