4 files changed, 39 insertions, 4 deletions
diff --git a/ports/pmdk/CONTROL b/ports/pmdk/CONTROL
index f440b68bc..c8346d105 100644
--- a/ports/pmdk/CONTROL
+++ b/ports/pmdk/CONTROL
@@ -1,3 +1,3 @@
 Source: pmdk
-Version: 1.4-1
+Version: 1.4-2
 Description: Persistent Memory Development Kit
 \ No newline at end of file
diff --git a/ports/pmdk/addPowerShellExecutionPolicy.patch b/ports/pmdk/addPowerShellExecutionPolicy.patch
new file mode 100644
index 000000000..692ff176a
--- /dev/null
+++ b/ports/pmdk/addPowerShellExecutionPolicy.patch
@@ -0,0 +1,22 @@
+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 89c48a8fb..215de2963 100644
--- a/ports/pmdk/portfile.cmake
+++ b/ports/pmdk/portfile.cmake
@@ -21,6 +21,9 @@ vcpkg_from_github(
     REF 1.4
     SHA512 95dbea9acfea4a6cb433a25f56f7484946a93fbce1c5e0e1d6ff36e0824e3e0e9f28f37024918998358f8ff12e69d0902fcf88357b9ad12695f32e06e86ffac8
     HEAD_REF master
+    PATCHES
+        "${CMAKE_CURRENT_LIST_DIR}/addPowerShellExecutionPolicy.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/v141.patch"
 )
 
 get_filename_component(PMDK_VERSION "${SOURCE_PATH}" NAME)
@@ -29,9 +32,6 @@ string(REPLACE "pmdk-" "" PMDK_VERSION "${PMDK_VERSION}")
 # Build only the selected projects
 vcpkg_build_msbuild(
     PROJECT_PATH ${SOURCE_PATH}/src/PMDK.sln
-    PLATFORM x64
-    PLATFORM_TOOLSET v140
-    TARGET_PLATFORM_VERSION 10.0.16299.0
     TARGET "Solution Items\\libpmem,Solution Items\\libpmemlog,Solution Items\\libpmemblk,Solution Items\\libpmemobj,Solution Items\\libpmemcto,Solution Items\\libpmempool,Solution Items\\libvmem,Solution Items\\Tools\\pmempool"
     OPTIONS /p:SRCVERSION=${PMDK_VERSION}
 )
diff --git a/ports/pmdk/v141.patch b/ports/pmdk/v141.patch
new file mode 100644
index 000000000..f77abe93f
--- /dev/null
+++ b/ports/pmdk/v141.patch
@@ -0,0 +1,13 @@
+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.