From 4807694ee2c0b06228093f6e7a599e03394b5648 Mon Sep 17 00:00:00 2001 From: Xing Ji Date: Wed, 25 Aug 2021 21:18:58 +0800 Subject: [PATCH 1/3] fix yaml-cpp can't compile with x64-windows-static for debugging --- ports/yaml-cpp/portfile.cmake | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ports/yaml-cpp/portfile.cmake b/ports/yaml-cpp/portfile.cmake index 33208b0ea3dab7..19ed0c86944d6b 100644 --- a/ports/yaml-cpp/portfile.cmake +++ b/ports/yaml-cpp/portfile.cmake @@ -22,12 +22,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") - vcpkg_cmake_config_fixup(CONFIG_PATH cmake) -endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/yaml-cpp") - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/yaml-cpp) -endif() +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/yaml-cpp) # Remove debug include files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") From 1209f3958341dd1ee27b1c064ab06ef7997c3c51 Mon Sep 17 00:00:00 2001 From: Xing Ji Date: Wed, 25 Aug 2021 21:25:12 +0800 Subject: [PATCH 2/3] add the `port-version` for `yaml-cpp` --- ports/yaml-cpp/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/yaml-cpp/vcpkg.json b/ports/yaml-cpp/vcpkg.json index afdbabbf715a0f..039bcd47e6cb8f 100644 --- a/ports/yaml-cpp/vcpkg.json +++ b/ports/yaml-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "yaml-cpp", "version-semver": "0.7.0", + "port-version": 1, "description": "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec.", "homepage": "https://github.com/jbeder/yaml-cpp", "documentation": "https://codedocs.xyz/jbeder/yaml-cpp/index.html", From c03949b196bcad16d27b2c819c31ad8307427ace Mon Sep 17 00:00:00 2001 From: Xing Ji Date: Wed, 25 Aug 2021 21:25:58 +0800 Subject: [PATCH 3/3] run `vcpkg x-add-version --all` --- versions/baseline.json | 2 +- versions/y-/yaml-cpp.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index a4cd4e99dae634..b34050f590efd3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6882,7 +6882,7 @@ }, "yaml-cpp": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 1 }, "yara": { "baseline": "4.1.1", diff --git a/versions/y-/yaml-cpp.json b/versions/y-/yaml-cpp.json index 6b39e7fe0beb68..2ced76ca0af7db 100644 --- a/versions/y-/yaml-cpp.json +++ b/versions/y-/yaml-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db67a32e2c013be3ebf697290953a993acecfd13", + "version-semver": "0.7.0", + "port-version": 1 + }, { "git-tree": "a71932a4f18c3cc6e0bd2bdce57fbf744e0efe2b", "version-semver": "0.7.0",