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/fixlibpmemobj-cpp.patch | |
| 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/fixlibpmemobj-cpp.patch')
| -rw-r--r-- | ports/libpmemobj-cpp/fixlibpmemobj-cpp.patch | 32 |
1 files changed, 1 insertions, 31 deletions
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)
|