Fixup

microsoft · May 15, 2024 · 0cfb76a · 0cfb76a
1 parent 17f4da0
commit 0cfb76a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ports/vcpkg-tool-meson/cmake-link-only.patch b/ports/vcpkg-tool-meson/cmake-link-only.patch
@@ -2,11 +2,12 @@ diff --git a/mesonbuild/cmake/generator.py b/mesonbuild/cmake/generator.py
 index 750e4c2..69e81d3 100644
 --- a/mesonbuild/cmake/generator.py
 +++ b/mesonbuild/cmake/generator.py
-@@ -140,6 +140,7 @@ def parse_generator_expressions(
+@@ -140,6 +140,8 @@ def parse_generator_expressions(
          'TARGET_NAME_IF_EXISTS': lambda x: x if x in trace.targets else '',
          'TARGET_PROPERTY': target_property,
          'TARGET_FILE': target_file,
-+        'LINK_ONLY': lambda x: ('*LINK_ONLY*' + x) if x in trace.targets else '',
++        'LINK_ONLY': lambda x: '*LINK_ONLY*' + x.replace('*LINK_ONLY*', ''),
++        'TARGET_NAME': lambda x: x,
      }
 
      # Recursively evaluate generator expressions

diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "b825564365c66016a646e78e85549a113f9294e2",
+      "git-tree": "22924273e82d0d1fabeb2c07e9bd336a2f4d3813",
       "version": "1.3.2",
       "port-version": 3
     },