diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2020-06-12 13:13:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 22:13:44 -0700 |
| commit | ac5e475583f69196138830bfaae41df7e826f067 (patch) | |
| tree | 9cb64dbcbb925b9af5522744f12026d7ec0f1cdd /ports/libpmemobj-cpp/fixlibpmemobj-cpp.patch | |
| parent | 0f161f9e12f78d701dac14b121179e089e166b1d (diff) | |
| download | vcpkg-ac5e475583f69196138830bfaae41df7e826f067.tar.gz vcpkg-ac5e475583f69196138830bfaae41df7e826f067.zip | |
[libpmemobj-cpp] Update to 1.10 (#11738)
* [libpmemobj-cpp] Update to 1.10
* [libpmemobj-cpp] Update to 1.10
* [libpmemobj-cpp] Update to 1.10
* fixlibpmemobj-cpp
* Update ports/libpmemobj-cpp/portfile.cmake
* Update ports/libpmemobj-cpp/portfile.cmake
* Update ports/libpmemobj-cpp/portfile.cmake
* Update ports/libpmemobj-cpp/portfile.cmake
* Update ports/libpmemobj-cpp/portfile.cmake
* Update ports/libpmemobj-cpp/CONTROL
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Diffstat (limited to 'ports/libpmemobj-cpp/fixlibpmemobj-cpp.patch')
| -rw-r--r-- | ports/libpmemobj-cpp/fixlibpmemobj-cpp.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/ports/libpmemobj-cpp/fixlibpmemobj-cpp.patch b/ports/libpmemobj-cpp/fixlibpmemobj-cpp.patch new file mode 100644 index 000000000..e5221b13a --- /dev/null +++ b/ports/libpmemobj-cpp/fixlibpmemobj-cpp.patch @@ -0,0 +1,47 @@ +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
+--- a/benchmarks/CMakeLists.txt
++++ b/benchmarks/CMakeLists.txt
+@@ -27,6 +27,12 @@ function(add_benchmark name)
+ prepend(srcs ${CMAKE_CURRENT_SOURCE_DIR} ${srcs})
+ add_executable(benchmark-${name} ${srcs})
+ target_link_libraries(benchmark-${name} ${LIBPMEMOBJ_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
++ install(
++ TARGETS benchmark-${name}
++ RUNTIME DESTINATION tools
++ LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION lib
++ )
+ endfunction()
+
+ add_check_whitespace(benchmarks-cmake ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt)
|