diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2020-10-13 06:24:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 15:24:13 -0700 |
| commit | 0eb207005d9f1fdb0beeafff14fd6ef788641ef6 (patch) | |
| tree | 7dde93f51ef14533a67c6b586748495cc146577a /ports/libpmemobj-cpp | |
| parent | 16816bc3f0b1c5a4c87493e0fa3e7e7e150b455e (diff) | |
| download | vcpkg-0eb207005d9f1fdb0beeafff14fd6ef788641ef6.tar.gz vcpkg-0eb207005d9f1fdb0beeafff14fd6ef788641ef6.zip | |
[libpmemobj-cpp] Update to 1.11 (#13944)
* [libpmemobj-cpp] Update to 1.11
* [libpmemobj-cpp] Update to 1.11
* [libpmemobj-cpp] Update to 1.11
* [libpmemobj-cpp] Update to 1.11
Diffstat (limited to 'ports/libpmemobj-cpp')
| -rw-r--r-- | ports/libpmemobj-cpp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libpmemobj-cpp/fixlibpmemobj-cpp.patch | 32 | ||||
| -rw-r--r-- | ports/libpmemobj-cpp/portfile.cmake | 4 |
3 files changed, 4 insertions, 34 deletions
diff --git a/ports/libpmemobj-cpp/CONTROL b/ports/libpmemobj-cpp/CONTROL index f28249093..c3dd8c750 100644 --- a/ports/libpmemobj-cpp/CONTROL +++ b/ports/libpmemobj-cpp/CONTROL @@ -1,5 +1,5 @@ Source: libpmemobj-cpp
-Version: 1.10
+Version: 1.11
Homepage: https://github.com/pmem/libpmemobj-cpp
Description: C++ bindings for libpmemobj (https://github.com/pmem/pmdk).
diff --git a/ports/libpmemobj-cpp/fixlibpmemobj-cpp.patch b/ports/libpmemobj-cpp/fixlibpmemobj-cpp.patch index e5221b13a..a589eae79 100644 --- a/ports/libpmemobj-cpp/fixlibpmemobj-cpp.patch +++ b/ports/libpmemobj-cpp/fixlibpmemobj-cpp.patch @@ -1,35 +1,5 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 55f068b..7123174 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -133,15 +133,17 @@ if(CLANG)
- endif()
- endif()
-
--if(BUILD_TESTS OR BUILD_EXAMPLES)
-- if(PKG_CONFIG_FOUND)
-- pkg_check_modules(LIBPMEMOBJ REQUIRED libpmemobj>=${LIBPMEMOBJ_REQUIRED_VERSION})
-- pkg_check_modules(LIBPMEM REQUIRED libpmem>=${LIBPMEM_REQUIRED_VERSION})
-- else()
-- find_package(LIBPMEMOBJ REQUIRED ${LIBPMEMOBJ_REQUIRED_VERSION})
-- find_package(LIBPMEM REQUIRED ${LIBPMEM_REQUIRED_VERSION})
-- endif()
-+if (BUILD_BENCHMARKS OR BUILD_TESTS OR BUILD_EXAMPLES)
-+if(PKG_CONFIG_FOUND)
-+ pkg_check_modules(LIBPMEMOBJ REQUIRED libpmemobj>=${LIBPMEMOBJ_REQUIRED_VERSION})
-+ pkg_check_modules(LIBPMEM REQUIRED libpmem>=${LIBPMEM_REQUIRED_VERSION})
-+else()
-+ find_package(LIBPMEMOBJ REQUIRED ${LIBPMEMOBJ_REQUIRED_VERSION})
-+ find_package(LIBPMEM REQUIRED ${LIBPMEM_REQUIRED_VERSION})
-+endif()
-+endif()
-
-+if(BUILD_TESTS OR BUILD_EXAMPLES)
- if (LIBPMEMOBJ_VERSION AND LIBPMEMOBJ_VERSION MATCHES "[0-9]+[.][0-9]+.*")
- string(REGEX REPLACE "\\+git.*" "" LIBPMEMOBJ_VERSION_SHORT ${LIBPMEMOBJ_VERSION})
- string(REGEX REPLACE "-rc.*" "" LIBPMEMOBJ_VERSION_SHORT ${LIBPMEMOBJ_VERSION_SHORT})
diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
-index a390731..e4764d3 100644
+index bb29b8d..839a77f 100644
--- a/benchmarks/CMakeLists.txt
+++ b/benchmarks/CMakeLists.txt
@@ -27,6 +27,12 @@ function(add_benchmark name)
diff --git a/ports/libpmemobj-cpp/portfile.cmake b/ports/libpmemobj-cpp/portfile.cmake index 172765f93..a11c76095 100644 --- a/ports/libpmemobj-cpp/portfile.cmake +++ b/ports/libpmemobj-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO pmem/libpmemobj-cpp
- REF 8ff8c542a87a6ac9cb52c5c04def66d844c290cb #v1.10
- SHA512 09ee9a027fee74d6352ec92445fb5c688b7cc28bc30258d4a9efc250242a1c43f6c55c07f9e43e72d50e09f93dc8eeaffabec9e205f2af2899bde63b7fbdfca1
+ REF 02c30bf553c36c683a4f826dac78f0dc5e8e7a2c #v1.11
+ SHA512 981e642c1cf3075454130c068fc6a7b0db35cde18581968b6ee17765db0e255e5d057feb68217b0b4a9b58e56c4578aa82b97cfa22112115382139bad5d8bce4
HEAD_REF master
PATCHES
fixlibpmemobj-cpp.patch
|