FixpmdkFailure

microsoft · May 9, 2018 · d91e2ef · d91e2ef
1 parent 7e79587
commit d91e2ef
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 1 deletion.
diff --git 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
diff --git a/ports/pmdk/addPowerShellExecutionPolicy.patch b/ports/pmdk/addPowerShellExecutionPolicy.patch
@@ -0,0 +1,22 @@
+diff --git a/srcversion.vcxproj b/srcversion.vcxproj
+index 8761197..795d1a7 100644
+--- a/srcversion.vcxproj
++++ b/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
@@ -26,6 +26,11 @@ vcpkg_from_github(
 get_filename_component(PMDK_VERSION "${SOURCE_PATH}" NAME)
 string(REPLACE "pmdk-" "" PMDK_VERSION "${PMDK_VERSION}")
 
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}/src/windows/srcversion
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/addPowerShellExecutionPolicy.patch"
+)
+
 # Build only the selected projects
 vcpkg_build_msbuild(
     PROJECT_PATH ${SOURCE_PATH}/src/PMDK.sln