From 27016a9b310583e97fd83f74b701fbb1aa38a560 Mon Sep 17 00:00:00 2001
From: past-due <30942300+past-due@users.noreply.github.com>
Date: Mon, 19 Mar 2018 18:26:06 -0400
Subject: [yaml-cpp] Fix build failure when VCPKG_BUILD_TYPE is set

---
 ports/yaml-cpp/portfile.cmake | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'ports/yaml-cpp')

diff --git a/ports/yaml-cpp/portfile.cmake b/ports/yaml-cpp/portfile.cmake
index 0fc4f05b6..096b178ac 100644
--- a/ports/yaml-cpp/portfile.cmake
+++ b/ports/yaml-cpp/portfile.cmake
@@ -32,7 +32,14 @@ get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)
 get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)" YAML_CONFIG "${YAML_CONFIG}")
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/yaml-cpp/yaml-cpp-targets.cmake "${YAML_CONFIG}")
 
-foreach(CONF debug release)
+set(_targets_cmake_conf)
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    list(APPEND _targets_cmake_conf "debug")
+endif()
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    list(APPEND _targets_cmake_conf "release")
+endif()
+foreach(CONF ${_targets_cmake_conf})
     file(READ ${CURRENT_PACKAGES_DIR}/share/yaml-cpp/yaml-cpp-targets-${CONF}.cmake YAML_CONFIG)
     string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${_IMPORT_PREFIX}" YAML_CONFIG "${YAML_CONFIG}")
     file(WRITE ${CURRENT_PACKAGES_DIR}/share/yaml-cpp/yaml-cpp-targets-${CONF}.cmake "${YAML_CONFIG}")
-- 
cgit v1.2.3


From 502c4653868efe6512f59400219085efc53f127a Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Wed, 21 Mar 2018 12:27:29 -0700
Subject: [yaml-cpp][zeromq][zstd] Fix non-windows

---
 ports/yaml-cpp/portfile.cmake | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'ports/yaml-cpp')

diff --git a/ports/yaml-cpp/portfile.cmake b/ports/yaml-cpp/portfile.cmake
index 096b178ac..071931f64 100644
--- a/ports/yaml-cpp/portfile.cmake
+++ b/ports/yaml-cpp/portfile.cmake
@@ -17,7 +17,12 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
+if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH CMake)
+endif()
+if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/yaml-cpp)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/yaml-cpp)
+endif()
 
 # Adjust paths and remove hardcoded ones from the config files
 file(READ ${CURRENT_PACKAGES_DIR}/share/yaml-cpp/yaml-cpp-config.cmake YAML_CONFIG)
-- 
cgit v1.2.3


From c3fb0b169751ec0f25ac3752a7e83e21173073a4 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Thu, 22 Mar 2018 03:08:25 -0700
Subject: [vcpkg] Download cmake on osx and linux

---
 ports/yaml-cpp/CONTROL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ports/yaml-cpp')

diff --git a/ports/yaml-cpp/CONTROL b/ports/yaml-cpp/CONTROL
index 1e2d0e5c9..bec9b7e13 100644
--- a/ports/yaml-cpp/CONTROL
+++ b/ports/yaml-cpp/CONTROL
@@ -1,3 +1,3 @@
 Source: yaml-cpp
-Version: 0.6.2
+Version: 0.6.2-1
 Description: yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec.
-- 
cgit v1.2.3


From ccd362f9e8637066d9f07d2a43c563eeabfc554d Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Thu, 22 Mar 2018 07:58:55 -0700
Subject: [yaml-cpp] Revert accidental version bump

---
 ports/yaml-cpp/CONTROL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ports/yaml-cpp')

diff --git a/ports/yaml-cpp/CONTROL b/ports/yaml-cpp/CONTROL
index bec9b7e13..1e2d0e5c9 100644
--- a/ports/yaml-cpp/CONTROL
+++ b/ports/yaml-cpp/CONTROL
@@ -1,3 +1,3 @@
 Source: yaml-cpp
-Version: 0.6.2-1
+Version: 0.6.2
 Description: yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec.
-- 
cgit v1.2.3