diff options
| author | Cheney-Wang <vcwrkspc@microsoft.com> | 2018-05-09 04:30:38 -0700 |
|---|---|---|
| committer | Cheney-Wang <vcwrkspc@microsoft.com> | 2018-05-09 04:30:38 -0700 |
| commit | d91e2ef669e45db8c62f320ad87b51f8e4ce9bed (patch) | |
| tree | 604a099c1902259d6d6cdf9aa5a9b5508c934523 | |
| parent | 7e7958739ed7e87617465235f8f9306ae521e82e (diff) | |
| download | vcpkg-d91e2ef669e45db8c62f320ad87b51f8e4ce9bed.tar.gz vcpkg-d91e2ef669e45db8c62f320ad87b51f8e4ce9bed.zip | |
FixpmdkFailure
| -rw-r--r-- | ports/pmdk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pmdk/addPowerShellExecutionPolicy.patch | 22 | ||||
| -rw-r--r-- | ports/pmdk/portfile.cmake | 5 |
3 files changed, 28 insertions, 1 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..bb03d23bb --- /dev/null +++ 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 index 89c48a8fb..0e292aa2c 100644 --- 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 |