early-access version 2853
This commit is contained in:
14
externals/vcpkg/ports/ignition-msgs1/fix-protobuf-static-link-order.patch
vendored
Executable file
14
externals/vcpkg/ports/ignition-msgs1/fix-protobuf-static-link-order.patch
vendored
Executable file
@@ -0,0 +1,14 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -2,8 +2,8 @@
|
||||
# Build a custom protoc plugin
|
||||
ign_add_executable(ign_msgs_gen Generator.cc generator_main.cc)
|
||||
target_link_libraries(ign_msgs_gen
|
||||
- protobuf::libprotobuf
|
||||
- protobuf::libprotoc)
|
||||
+ protobuf::libprotoc
|
||||
+ protobuf::libprotobuf)
|
||||
target_include_directories(ign_msgs_gen PRIVATE ${PROTOBUF_INCLUDE_DIR})
|
||||
target_compile_features(ign_msgs_gen PRIVATE ${IGN_CXX_11_FEATURES})
|
||||
|
||||
21
externals/vcpkg/ports/ignition-msgs1/portfile.cmake
vendored
Executable file
21
externals/vcpkg/ports/ignition-msgs1/portfile.cmake
vendored
Executable file
@@ -0,0 +1,21 @@
|
||||
# Explicitly disable cross-compilation until the upstream discussion
|
||||
# https://bitbucket.org/ignitionrobotics/ign-msgs/issues/34/add-support-for-cross-compilation is solved
|
||||
if(CMAKE_HOST_WIN32 AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x64" AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
|
||||
set(ignition_msgs_CROSSCOMPILING ON)
|
||||
elseif(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME)
|
||||
set(ignition_msgs_CROSSCOMPILING ON)
|
||||
else()
|
||||
set(ignition_msgs_CROSSCOMPILING OFF)
|
||||
endif()
|
||||
|
||||
if(ignition_msgs_CROSSCOMPILING)
|
||||
message(FATAL_ERROR "This port does not currently support triplets that require cross-compilation.")
|
||||
endif()
|
||||
|
||||
ignition_modular_library(NAME msgs
|
||||
VERSION "1.0.0"
|
||||
# See https://bitbucket.org/ignitionrobotics/ign-msgs/issues/33/the-ignition-msgs1_100-tag-does-not-match
|
||||
REF ignition-msgs_1.0.0
|
||||
SHA512 18475cc76cc3b58e451faf7a57a0145a9b419cf3e4312627202d96982b066df48cbabcc9991b79a176c5180b90f019dc30114286ad5562c483759052cf63d945
|
||||
# Fix linking order of protobuf libraries (backport of https://bitbucket.org/ignitionrobotics/ign-msgs/pull-requests/151)
|
||||
PATCHES fix-protobuf-static-link-order.patch)
|
||||
16
externals/vcpkg/ports/ignition-msgs1/vcpkg.json
vendored
Executable file
16
externals/vcpkg/ports/ignition-msgs1/vcpkg.json
vendored
Executable file
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"name": "ignition-msgs1",
|
||||
"version": "1.0.0",
|
||||
"port-version": 5,
|
||||
"description": "Middleware protobuf messages for robotics",
|
||||
"license": null,
|
||||
"dependencies": [
|
||||
"ignition-cmake0",
|
||||
"ignition-math4",
|
||||
{
|
||||
"name": "ignition-modularscripts",
|
||||
"host": true
|
||||
},
|
||||
"protobuf"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user