mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 10:28:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[pmdk] Fix v140 requirement

Browse Source
This commit is contained in:
Alexander Karatarakis 2018-05-17 14:08:52 -07:00
parent d91e2ef669
commit 8ee61ea6d0
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/pmdk/addPowerShellExecutionPolicy.patch
View File

@ -1,7 +1,7 @@
diff --git a/srcversion.vcxproj b/srcversion.vcxproj
diff --git a/src/windows/srcversion/srcversion.vcxproj b/src/windows/srcversion/srcversion.vcxproj
index 8761197..795d1a7 100644
--- a/srcversion.vcxproj
+++ b/srcversion.vcxproj
--- a/src/windows/srcversion/srcversion.vcxproj
+++ b/src/windows/srcversion/srcversion.vcxproj
@@ -72,7 +72,7 @@
</Command>
</PreBuildEvent>

11
ports/pmdk/portfile.cmake
View File

@ -21,22 +21,17 @@ 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)
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
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}
)

13
ports/pmdk/v141.patch Normal file
View File

@ -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.