[vcpkg] fatal_error when patch fails to apply (#8087)

vcpkg will now fail on failure to apply patches except when using `--head`.

4 files changed, 4 insertions, 44 deletions

diff --git a/ports/pmdk/CONTROL b/ports/pmdk/CONTROL
index 803544c91..b0af698c5 100644
--- a/ports/pmdk/CONTROL
+++ b/ports/pmdk/CONTROL
@@ -1,3 +1,3 @@
 Source: pmdk
-Version: 1.6-1
+Version: 1.6-3
 Description: Persistent Memory Development Kit
diff --git a/ports/pmdk/addPowerShellExecutionPolicy.patch b/ports/pmdk/addPowerShellExecutionPolicy.patch
deleted file mode 100644
index 692ff176a..000000000
--- a/ports/pmdk/addPowerShellExecutionPolicy.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/windows/srcversion/srcversion.vcxproj b/src/windows/srcversion/srcversion.vcxproj

-index 8761197..795d1a7 100644

---- a/src/windows/srcversion/srcversion.vcxproj

-+++ b/src/windows/srcversion/srcversion.vcxproj

-@@ -72,7 +72,7 @@

-       </Command>

-     </PreBuildEvent>

-     <CustomBuildStep>

--      <Command>powershell.exe -file "$(SolutionDir)..\utils\SRCVERSION.ps1" $(SRCVERSION)</Command>

-+      <Command>powershell.exe -ExecutionPolicy Bypass -file "$(SolutionDir)..\utils\SRCVERSION.ps1" $(SRCVERSION)</Command>

-       <Outputs>__NON_EXISTENT_FILE__</Outputs>

-       <Message>generate srcversion.h</Message>

-     </CustomBuildStep>

-@@ -99,7 +99,7 @@

-       </Command>

-     </PreBuildEvent>

-     <CustomBuildStep>

--      <Command>powershell.exe -file "$(SolutionDir)..\utils\SRCVERSION.ps1" $(SRCVERSION)</Command>

-+      <Command>powershell.exe -ExecutionPolicy Bypass -file "$(SolutionDir)..\utils\SRCVERSION.ps1" $(SRCVERSION)</Command>

-       <Outputs>__NON_EXISTENT_FILE__</Outputs>

-       <Message>generate srcversion.h</Message>

-     </CustomBuildStep>

diff --git a/ports/pmdk/portfile.cmake b/ports/pmdk/portfile.cmake
index 4bede2bb9..b4ed6c41d 100644
--- a/ports/pmdk/portfile.cmake
+++ b/ports/pmdk/portfile.cmake
@@ -8,21 +8,16 @@ elseif (TRIPLET_SYSTEM_ARCH MATCHES "x86")
     message(FATAL_ERROR "x86 is not supported. Please use pmdk:x64-windows instead.")
 endif()
 
-# Download source
+set(PMDK_VERSION "1.6")
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pmem/pmdk
-    REF 1.6
+    REF ${PMDK_VERSION}
     SHA512 f66e4edf1937d51abfa7c087b65a64109cd3d2a8d9587d6c4fc28a1003d67ec1f35a0011c9a9d0bfe76ad7227be83e86582f8405c988eac828d8ae5d0a399483
     HEAD_REF master
-    PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/addPowerShellExecutionPolicy.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/v141.patch"
 )
 
-get_filename_component(PMDK_VERSION "${SOURCE_PATH}" NAME)
-string(REPLACE "pmdk-" "" PMDK_VERSION "${PMDK_VERSION}")
-
 # Build only the selected projects
 vcpkg_build_msbuild(
     PROJECT_PATH ${SOURCE_PATH}/src/PMDK.sln
diff --git a/ports/pmdk/v141.patch b/ports/pmdk/v141.patch
deleted file mode 100644
index f77abe93f..000000000
--- a/ports/pmdk/v141.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/common/util.h b/src/common/util.h

-index 04b098f..33a64c2 100644

---- a/src/common/util.h

-+++ b/src/common/util.h

-@@ -284,7 +284,7 @@ typedef enum {

- #error MSVC ports of util_atomic_ only work on X86_64

- #endif

- 

--#if _MSC_VER > 1911

-+#if _MSC_VER >= 2000

- #error util_atomic_ utility functions not tested with this version of VC++

- #error These utility functions are not future proof, as they are not

- #error based on publicly available documentation.