[tgui] fix absolute paths (#23211)

microsoft · Feb 22, 2022 · 5ce0ab7 · 5ce0ab7
1 parent a4484d8
commit 5ce0ab7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/ports/tgui/portfile.cmake b/ports/tgui/portfile.cmake
@@ -23,19 +23,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     tool    TGUI_BUILD_GUI_BUILDER
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
-    PREFER_NINJA
     OPTIONS ${FEATURE_OPTIONS}
         -DTGUI_MISC_INSTALL_PREFIX=${TGUI_SHARE_PATH}
         -DTGUI_SHARED_LIBS=${TGUI_SHARED_LIBS}
         -DTGUI_BACKEND=Custom
         -DTGUI_BUILD_EXAMPLES=OFF
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/TGUI)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/TGUI)
 vcpkg_copy_pdbs()
 
 if("tool" IN_LIST FEATURES)
@@ -60,5 +59,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/TGUI/extlibs/nanosvg" "${CU
 
 file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/share/${PORT}/doc")
 
+vcpkg_fixup_pkgconfig()
+
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/tgui/vcpkg.json b/ports/tgui/vcpkg.json
@@ -1,9 +1,20 @@
 {
   "name": "tgui",
   "version-date": "2021-04-19",
-  "port-version": 2,
+  "port-version": 3,
   "description": "TGUI is an easy to use, cross-platform, C++ GUI for SFML.",
   "homepage": "https://tgui.eu",
+  "license": "Zlib",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
   "default-features": [
     "sdl2",
     "sfml"

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6814,7 +6814,7 @@
     },
     "tgui": {
       "baseline": "2021-04-19",
-      "port-version": 2
+      "port-version": 3
     },
     "theia": {
       "baseline": "0.8",

diff --git a/versions/t-/tgui.json b/versions/t-/tgui.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0fe7d561ea6d038584711e8581f6a5a72062c543",
+      "version-date": "2021-04-19",
+      "port-version": 3
+    },
     {
       "git-tree": "0fd517c4e738da62e959b791a6cdd952e7bd8345",
       "version-date": "2021-04-19",