[tl] Update tl::expected and tl::optional, add tl::function_ref (#7028)

* [tl] Update tl::expected and tl::optional, add tl::function_ref

* [tl-expected][tl-function-ref][tl-optional] Always prepopulate FetchContent
This commit is contained in:
Simon Brand 2019-06-26 06:09:16 +01:00 committed by Robert Schumacher
parent 32ee6c96ce
commit 7b540fe208
6 changed files with 82 additions and 10 deletions

View File

@ -1,3 +1,3 @@
Source: tl-expected Source: tl-expected
Version: 0.3-1 Version: 1.0.0-1
Description: C++11/14/17 std::expected implementation with functional-style extensions Description: C++11/14/17 std::expected implementation with functional-style extensions

View File

@ -3,13 +3,31 @@ include(vcpkg_common_functions)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO TartanLlama/expected REPO TartanLlama/expected
REF v0.3 REF v1.0.0
SHA512 a228399f7103020ed814f1c755b82cf831b3d8c6aaa23dbc3aedc226b3cbd39c22075952dda3af84c8cf6f74ab1131c6997a2431ee62314bd82ccafdc9ab23a3 SHA512 747ea34b5540dfcf595896332851f10c52a823ab8ba3fc8152478b0a9e8ca01f0f26827348407249827f4106ff577bd6e697ea6f749c1f21bd1f0913a621075d
HEAD_REF master HEAD_REF master
) )
# Install header file vcpkg_from_github(
file(INSTALL ${SOURCE_PATH}/tl DESTINATION ${CURRENT_PACKAGES_DIR}/include) OUT_SOURCE_PATH TL_CMAKE_SOURCE_DIR
REPO TartanLlama/tl-cmake
REF 284c6a3f0f61823cc3871b0f193e8df699e2c4ce
SHA512 f611326d75d6e87e58cb05e91f9506b1d83e6fd3b214fe311c4c15604feabfb7a18bbf9c4b4c389a39d615eb468b1f4b15802ab9f44f334a12310cb183fa77a7
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DFETCHCONTENT_FULLY_DISCONNECTED=ON
-DFETCHCONTENT_SOURCE_DIR_TL_CMAKE=${TL_CMAKE_SOURCE_DIR}
-DEXPECTED_ENABLE_TESTS=OFF
)
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
# Handle copyright # Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/tl-expected RENAME copyright) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/tl-expected RENAME copyright)

View File

@ -0,0 +1,3 @@
Source: tl-function-ref
Version: 1.0.0-1
Description: A lightweight, non-owning reference to a callable.

View File

@ -0,0 +1,33 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO TartanLlama/function_ref
REF v1.0.0
SHA512 64324049021548361caa667a5ad61a8c0acc787d3966e5b132520da99af709970e37b5a5cb71f69523b6254c9d0d8bab441356e7a25880fe53a6998067c587bd
HEAD_REF master
)
vcpkg_from_github(
OUT_SOURCE_PATH TL_CMAKE_SOURCE_DIR
REPO TartanLlama/tl-cmake
REF 284c6a3f0f61823cc3871b0f193e8df699e2c4ce
SHA512 f611326d75d6e87e58cb05e91f9506b1d83e6fd3b214fe311c4c15604feabfb7a18bbf9c4b4c389a39d615eb468b1f4b15802ab9f44f334a12310cb183fa77a7
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DFETCHCONTENT_FULLY_DISCONNECTED=ON
-DFETCHCONTENT_SOURCE_DIR_TL_CMAKE=${TL_CMAKE_SOURCE_DIR}
-DFUNCTION_REF_ENABLE_TESTS=OFF
)
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/tl-function-ref RENAME copyright)

View File

@ -1,3 +1,3 @@
Source: tl-optional Source: tl-optional
Version: 0.5-1 Version: 1.0.0-1
Description: C++11/14/17 std::optional implementation with functional-style extensions Description: C++11/14/17 std::optional implementation with functional-style extensions

View File

@ -3,13 +3,31 @@ include(vcpkg_common_functions)
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO TartanLlama/optional REPO TartanLlama/optional
REF v0.5 REF v1.0.0
SHA512 f4f72c1ba431737fb7b1b6468b7dbbb025f299775e0a3401993490a60d5999d31ccf1e48c0cd57836293a5534ea4749b9f1c8f65f896144204af3389a5e512f9 SHA512 6e5020808650ec312f5cdf4bc92be9067dc214c2e02d635511e99b325d34c360ce360cf93e67287dba4b9c0d674f3cbae96a75b83b13374fbb1291d2bb0f078a
HEAD_REF master HEAD_REF master
) )
# Install header file vcpkg_from_github(
file(INSTALL ${SOURCE_PATH}/tl DESTINATION ${CURRENT_PACKAGES_DIR}/include) OUT_SOURCE_PATH TL_CMAKE_SOURCE_DIR
REPO TartanLlama/tl-cmake
REF 284c6a3f0f61823cc3871b0f193e8df699e2c4ce
SHA512 f611326d75d6e87e58cb05e91f9506b1d83e6fd3b214fe311c4c15604feabfb7a18bbf9c4b4c389a39d615eb468b1f4b15802ab9f44f334a12310cb183fa77a7
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DFETCHCONTENT_FULLY_DISCONNECTED=ON
-DFETCHCONTENT_SOURCE_DIR_TL_CMAKE=${TL_CMAKE_SOURCE_DIR}
-DOPTIONAL_ENABLE_TESTS=OFF
)
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
# Handle copyright # Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/tl-optional RENAME copyright) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/tl-optional RENAME copyright)