diff options
| author | Simon Brand <tartanllama@gmail.com> | 2019-06-26 06:09:16 +0100 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-06-25 22:09:16 -0700 |
| commit | 7b540fe2084bbe1fff46cfdfcde10fadbd021189 (patch) | |
| tree | bf7b91460f5083805b4b657f71def40fd3493028 /ports/tl-optional | |
| parent | 32ee6c96ce48beffd64fea04c676ffb0d297681b (diff) | |
| download | vcpkg-7b540fe2084bbe1fff46cfdfcde10fadbd021189.tar.gz vcpkg-7b540fe2084bbe1fff46cfdfcde10fadbd021189.zip | |
[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
Diffstat (limited to 'ports/tl-optional')
| -rw-r--r-- | ports/tl-optional/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tl-optional/portfile.cmake | 26 |
2 files changed, 23 insertions, 5 deletions
diff --git a/ports/tl-optional/CONTROL b/ports/tl-optional/CONTROL index 3be044dbe..5464d8054 100644 --- a/ports/tl-optional/CONTROL +++ b/ports/tl-optional/CONTROL @@ -1,3 +1,3 @@ Source: tl-optional
-Version: 0.5-1
+Version: 1.0.0-1
Description: C++11/14/17 std::optional implementation with functional-style extensions
diff --git a/ports/tl-optional/portfile.cmake b/ports/tl-optional/portfile.cmake index b6d98b9e0..3c3085cc9 100644 --- a/ports/tl-optional/portfile.cmake +++ b/ports/tl-optional/portfile.cmake @@ -3,13 +3,31 @@ include(vcpkg_common_functions) vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO TartanLlama/optional
- REF v0.5
- SHA512 f4f72c1ba431737fb7b1b6468b7dbbb025f299775e0a3401993490a60d5999d31ccf1e48c0cd57836293a5534ea4749b9f1c8f65f896144204af3389a5e512f9
+ REF v1.0.0
+ SHA512 6e5020808650ec312f5cdf4bc92be9067dc214c2e02d635511e99b325d34c360ce360cf93e67287dba4b9c0d674f3cbae96a75b83b13374fbb1291d2bb0f078a
HEAD_REF master
)
-# Install header file
-file(INSTALL ${SOURCE_PATH}/tl DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+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}
+ -DOPTIONAL_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-optional RENAME copyright)
|