Skip to content

Commit

Permalink
[redis-plus-plus] Add c++17 feature (#14762)
Browse files Browse the repository at this point in the history
* Build using c++17 standard

* Add a feature cxx17 instead

* Update ports/redis-plus-plus/portfile.cmake

* Update ports/redis-plus-plus/CONTROL

* Modify FEATURE_OPTIONS

* Modify feature options

* Add feature Cxx17

* Modify options

* Update ports/redis-plus-plus/portfile.cmake

* Update ports/redis-plus-plus/portfile.cmake

* Update ports/redis-plus-plus/portfile.cmake

* Modify the CONTROL file

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
  • Loading branch information
JonLiu1993 and JackBoosY committed Dec 1, 2020
1 parent 6b19f55 commit 8c3be9e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
6 changes: 5 additions & 1 deletion ports/redis-plus-plus/CONTROL
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
Source: redis-plus-plus
Version: 1.2.1
Port-Version: 1
Homepage: https://github.com/sewenew/redis-plus-plus
Description: This is a C++ client for Redis. It's based on hiredis, and written in C++ 11.
Build-Depends: hiredis
Build-Depends: hiredis

Feature: cxx17
Description: Build redis-plus-plus with cxx 17 standard
9 changes: 8 additions & 1 deletion ports/redis-plus-plus/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ vcpkg_from_github(
fix-conversion.patch
)

if("cxx17" IN_LIST FEATURES)
set(REDIS_PLUS_PLUS_CXX_STANDARD 17)
else()
set(REDIS_PLUS_PLUS_CXX_STANDARD 11)
endif()

if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
set(REDIS_PLUS_PLUS_BUILD_STATIC ON)
set(REDIS_PLUS_PLUS_BUILD_SHARED OFF)
Expand All @@ -25,6 +31,7 @@ vcpkg_configure_cmake(
-DREDIS_PLUS_PLUS_BUILD_STATIC=${REDIS_PLUS_PLUS_BUILD_STATIC}
-DREDIS_PLUS_PLUS_BUILD_SHARED=${REDIS_PLUS_PLUS_BUILD_SHARED}
-DREDIS_PLUS_PLUS_BUILD_TEST=OFF
-DREDIS_PLUS_PLUS_CXX_STANDARD=${REDIS_PLUS_PLUS_CXX_STANDARD}
)

vcpkg_install_cmake()
Expand All @@ -34,4 +41,4 @@ vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright )
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright )

0 comments on commit 8c3be9e

Please sign in to comment.