mirror of https://github.com/microsoft/vcpkg.git
[gz-msgs] Update to 11.1.0 (#46791)
This commit is contained in:
parent
e12243292e
commit
647c8249eb
|
|
@ -1,24 +1,24 @@
|
|||
diff --git a/gz-msgs-extras.cmake.in b/gz-msgs-extras.cmake.in
|
||||
index b70c04a..537a54e 100644
|
||||
--- a/gz-msgs-extras.cmake.in
|
||||
+++ b/gz-msgs-extras.cmake.in
|
||||
@@ -33,7 +33,7 @@ set(FACTORY_SCRIPT_NAME "@PROJECT_NAME@_generate_factory.py")
|
||||
set(@PROJECT_NAME@_PROTO_PATH ${@PROJECT_NAME@_INSTALL_PATH}/share/protos)
|
||||
# Provide support to override generator executable used during cross-compilation
|
||||
if(NOT DEFINED @PROJECT_NAME@_PROTO_GENERATOR_PLUGIN)
|
||||
- set(@PROJECT_NAME@_PROTO_GENERATOR_PLUGIN ${@PROJECT_NAME@_INSTALL_PATH}/bin/${PROTOC_NAME})
|
||||
+ set(@PROJECT_NAME@_PROTO_GENERATOR_PLUGIN ${VCPKG_IMPORT_PREFIX}/tools/@PROJECT_NAME@/${PROTOC_NAME})
|
||||
endif()
|
||||
if(NOT DEFINED @PROJECT_NAME@_PROTOC_EXECUTABLE)
|
||||
set(@PROJECT_NAME@_PROTOC_EXECUTABLE protobuf::protoc)
|
||||
@@ -41,8 +41,8 @@ endif()
|
||||
if(NOT DEFINED @PROJECT_NAME@_PYTHON_INTERPRETER)
|
||||
set(@PROJECT_NAME@_PYTHON_INTERPRETER Python3::Interpreter)
|
||||
endif()
|
||||
-set(@PROJECT_NAME@_PROTO_GENERATOR_SCRIPT ${@PROJECT_NAME@_INSTALL_PATH}/bin/${PROTO_SCRIPT_NAME})
|
||||
-set(@PROJECT_NAME@_FACTORY_GENERATOR_SCRIPT ${@PROJECT_NAME@_INSTALL_PATH}/bin/${FACTORY_SCRIPT_NAME})
|
||||
+set(@PROJECT_NAME@_PROTO_GENERATOR_SCRIPT ${VCPKG_IMPORT_PREFIX}/tools/@PROJECT_NAME@/${PROTO_SCRIPT_NAME})
|
||||
+set(@PROJECT_NAME@_FACTORY_GENERATOR_SCRIPT ${VCPKG_IMPORT_PREFIX}/tools/@PROJECT_NAME@/${FACTORY_SCRIPT_NAME})
|
||||
|
||||
##################################################
|
||||
# A function to generate a target mesage library from a group of protobuf files .
|
||||
diff --git a/gz-msgs-extras.cmake.in b/gz-msgs-extras.cmake.in
|
||||
index 7c322b1..78cf807 100644
|
||||
--- a/gz-msgs-extras.cmake.in
|
||||
+++ b/gz-msgs-extras.cmake.in
|
||||
@@ -33,7 +33,7 @@ set(FACTORY_SCRIPT_NAME "@PROJECT_NAME@_generate_factory.py")
|
||||
set(@PROJECT_NAME@_PROTO_PATH ${@PROJECT_NAME@_INSTALL_PATH}/share/protos)
|
||||
# Provide support to override generator executable used during cross-compilation
|
||||
if(NOT DEFINED @PROJECT_NAME@_PROTO_GENERATOR_PLUGIN)
|
||||
- set(@PROJECT_NAME@_PROTO_GENERATOR_PLUGIN ${@PROJECT_NAME@_INSTALL_PATH}/bin/${PROTOC_NAME})
|
||||
+ set(@PROJECT_NAME@_PROTO_GENERATOR_PLUGIN ${VCPKG_IMPORT_PREFIX}/tools/@PROJECT_NAME@/${PROTOC_NAME})
|
||||
endif()
|
||||
if(NOT DEFINED @PROJECT_NAME@_PROTOC_EXECUTABLE)
|
||||
set(@PROJECT_NAME@_PROTOC_EXECUTABLE protobuf::protoc)
|
||||
@@ -41,8 +41,8 @@ endif()
|
||||
if(NOT DEFINED @PROJECT_NAME@_PYTHON_INTERPRETER)
|
||||
set(@PROJECT_NAME@_PYTHON_INTERPRETER Python3::Interpreter)
|
||||
endif()
|
||||
-set(@PROJECT_NAME@_PROTO_GENERATOR_SCRIPT ${@PROJECT_NAME@_INSTALL_PATH}/bin/${PROTO_SCRIPT_NAME})
|
||||
-set(@PROJECT_NAME@_FACTORY_GENERATOR_SCRIPT ${@PROJECT_NAME@_INSTALL_PATH}/bin/${FACTORY_SCRIPT_NAME})
|
||||
+set(@PROJECT_NAME@_PROTO_GENERATOR_SCRIPT ${VCPKG_IMPORT_PREFIX}/tools/@PROJECT_NAME@/${PROTO_SCRIPT_NAME})
|
||||
+set(@PROJECT_NAME@_FACTORY_GENERATOR_SCRIPT ${VCPKG_IMPORT_PREFIX}/tools/@PROJECT_NAME@/${FACTORY_SCRIPT_NAME})
|
||||
|
||||
##################################################
|
||||
# A function to generate a target message library from a group of protobuf files .
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ ignition_modular_library(
|
|||
NAME ${PACKAGE_NAME}
|
||||
REF ${PORT}${VERSION_MAJOR}_${VERSION}
|
||||
VERSION ${VERSION}
|
||||
SHA512 b96ec15d2ef46eebab6bebb6ffbd8f11b7bd9ed27156e753343603546d49db41afb3cf926b72de7eb9f702c40ad7e029dd3ddfe3e00d6d503cc45c1a0b8761d9
|
||||
SHA512 43c75eb30f00708c54f3de54737a4f1bda4a77a1d1ca3ba1354270beb01db078e73b909fdebb33b938a45a9808d4d2f2c164efe01c98aaec7a88003c85fab6f9
|
||||
OPTIONS
|
||||
${options}
|
||||
"-DCMAKE_PROJECT_INCLUDE=${CURRENT_PORT_DIR}/cmake-project-include.cmake"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
"name": "gz-msgs",
|
||||
"version": "11.0.2",
|
||||
"port-version": 2,
|
||||
"version": "11.1.0",
|
||||
"description": "Protobuf messages and functions for robot applications",
|
||||
"license": "Apache-2.0",
|
||||
"supports": "!uwp",
|
||||
|
|
|
|||
|
|
@ -3549,8 +3549,8 @@
|
|||
"port-version": 1
|
||||
},
|
||||
"gz-msgs": {
|
||||
"baseline": "11.0.2",
|
||||
"port-version": 2
|
||||
"baseline": "11.1.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"gz-msgs9": {
|
||||
"baseline": "9.5.0",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "e872aa215fc2daa52529e9477927abd0e1492b6a",
|
||||
"version": "11.1.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "df537bd272706b69fb0a0379718eaaea03f7e8e3",
|
||||
"version": "11.0.2",
|
||||
|
|
|
|||
Loading…
Reference in New Issue