From 7dc2a4ca9b1498004ab638202e5d991eacdf3dd3 Mon Sep 17 00:00:00 2001
From: Michael Hansen <zrax0111@gmail.com>
Date: Wed, 22 Jan 2020 12:37:27 -0800
Subject: [PATCH] [string_theory] Update to 3.0, which is now header-only.
 (#9690)

---
 ports/string-theory/CONTROL        |  2 +-
 ports/string-theory/portfile.cmake | 24 ++++--------------------
 scripts/ci.baseline.txt            |  3 ---
 3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/ports/string-theory/CONTROL b/ports/string-theory/CONTROL
index e2a64330e7..18e9b1014b 100644
--- a/ports/string-theory/CONTROL
+++ b/ports/string-theory/CONTROL
@@ -1,4 +1,4 @@
 Source: string-theory
-Version: 2.3
+Version: 3.0
 Homepage: https://github.com/zrax/string_theory
 Description: Flexible modern C++ string library with type-safe formatting.
diff --git a/ports/string-theory/portfile.cmake b/ports/string-theory/portfile.cmake
index 596f77b92d..a82fec30ec 100644
--- a/ports/string-theory/portfile.cmake
+++ b/ports/string-theory/portfile.cmake
@@ -1,24 +1,14 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO zrax/string_theory
-    REF 2.3
-    SHA512 2e0bae7aeeedf81343ee88482a3d9afc99cc2e8bede375cb191782bcd53044cfd4a16a79efd463b657914a5ddca8209210815a6549fe527d9cc60e9048d3c672
+    REF 3.0
+    SHA512 96e596b908c1b61b67497d8ecea7523b36e1bce0ef41bee90a144de1d98c5dbc51336e22934e6331862741879cfed450b620b89222e774048e5d17ebd11ad2a8
     HEAD_REF master
 )
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    set(ST_BUILD_STATIC ON)
-else()
-    set(ST_BUILD_STATIC OFF)
-endif()
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS
-        -DST_BUILD_STATIC=${ST_BUILD_STATIC}
 )
 
 vcpkg_install_cmake()
@@ -26,14 +16,8 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/string_theory)
 
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/string-theory ${CURRENT_PACKAGES_DIR}/share/string_theory)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-
-vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/string-theory)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 547ee1a87a..af974a83fb 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1610,9 +1610,6 @@ spirv-tools:arm-uwp=fail
 spirv-tools:x64-uwp=fail
 stormlib:arm-uwp=fail
 stormlib:x64-uwp=fail
-string-theory:arm-uwp=fail
-string-theory:x64-uwp=fail
-string-theory:x64-windows=ignore
 stxxl:arm-uwp=fail
 stxxl:x64-uwp=fail
 systemc:arm64-windows=fail