[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>
microsoft · Jul 5, 2022 · 497e1e5 · 497e1e5
1 parent a147691
commit 497e1e5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/ports/gazebo/portfile.cmake b/ports/gazebo/portfile.cmake
@@ -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()
 

diff --git a/ports/gazebo/vcpkg.json b/ports/gazebo/vcpkg.json
@@ -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",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2454,7 +2454,7 @@
     },
     "gazebo": {
       "baseline": "2022-01-20",
-      "port-version": 1
+      "port-version": 2
     },
     "gcem": {
       "baseline": "1.14.1",

diff --git a/versions/g-/gazebo.json b/versions/g-/gazebo.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "324403bb31aad7705e0f444e9c49f2b11417b9b0",
+      "version-date": "2022-01-20",
+      "port-version": 2
+    },
     {
       "git-tree": "702a7de5c38ff156813a73a32eac6c7ca73248e4",
       "version-date": "2022-01-20",