[gazebo] Fix Plugin failed with status code 3221225785 (#25500)

* [gazebo] Fix Plugin failed with status code 3221225785

* x-add-version

* Use ADD_BIN_TO_PATH in vcpkg_cmake_install

* x-add-version gazebo --overwrite-version

* Add PKG_CONFIG_EXECUTABLE

* x-add-version

* Use VCPKG_HOST_EXECUTABLE_SUFFIX

* x-add-version

Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
This commit is contained in:
Cheney Wang 2022-07-06 06:08:18 +08:00 committed by GitHub
parent a147691f50
commit 497e1e56a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 6 deletions

View File

@ -22,18 +22,16 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
graphviz NO_GRAPHVIZ_FEATURE
)
vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/debug/bin")
vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/bin")
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON
-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf.exe
-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}
${FEATURE_OPTIONS}
-DBUILD_TESTING=OFF # Not enabled by default, but to be sure
)
vcpkg_cmake_install()
vcpkg_cmake_install(ADD_BIN_TO_PATH)
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/gazebo")
vcpkg_copy_pdbs()

View File

@ -1,7 +1,7 @@
{
"name": "gazebo",
"version-date": "2022-01-20",
"port-version": 1,
"port-version": 2,
"description": "Open source robotics simulator.",
"homepage": "http://gazebosim.org",
"license": "Apache-2.0",

View File

@ -2454,7 +2454,7 @@
},
"gazebo": {
"baseline": "2022-01-20",
"port-version": 1
"port-version": 2
},
"gcem": {
"baseline": "1.14.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "324403bb31aad7705e0f444e9c49f2b11417b9b0",
"version-date": "2022-01-20",
"port-version": 2
},
{
"git-tree": "702a7de5c38ff156813a73a32eac6c7ca73248e4",
"version-date": "2022-01-20",