[docopt] Update to latest version. (#37046)

- [X] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [X] SHA512s are updated for each updated download.
- [ ] The "supports" clause reflects platforms that may be fixed by this
new version.
- [ ] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [X] Any patches that are no longer applied are deleted from the port's
directory.
- [X] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [X] Only one version is added to each modified port's versions file.
This commit is contained in:
Theodore Tsirpanis 2024-03-01 09:07:01 +02:00 committed by GitHub
parent 60a7a4e08e
commit ba2298b26c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 13 additions and 78 deletions

View File

@ -1,28 +0,0 @@
diff --git a/docopt.h b/docopt.h
index 4c40741..06a04f8 100644
--- a/docopt.h
+++ b/docopt.h
@@ -85,6 +85,9 @@ namespace docopt {
bool help = true,
std::string const& version = {},
bool options_first = false) noexcept;
+
+ /// Write out the contents to the ostream
+ std::ostream DOCOPT_API & operator<<(std::ostream&, value const&);
}
#ifdef DOCOPT_HEADER_ONLY
diff --git a/docopt_value.h b/docopt_value.h
index a923219..7f0d6d6 100644
--- a/docopt_value.h
+++ b/docopt_value.h
@@ -102,9 +102,6 @@ namespace docopt {
Kind kind = Kind::Empty;
Variant variant {};
};
-
- /// Write out the contents to the ostream
- std::ostream& operator<<(std::ostream&, value const&);
}
namespace std {

View File

@ -1,16 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1aba5ae..5407e4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,7 +113,10 @@ endif()
set(export_name "docopt-targets")
# Runtime package
-install(TARGETS docopt EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS docopt EXPORT ${export_name}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
# Development package
install(TARGETS docopt_s EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR})

View File

@ -1,21 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bff867c..cc7d706 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,13 +113,15 @@ endif()
set(export_name "docopt-targets")
# Runtime package
+if(BUILD_SHARED_LIBS)
install(TARGETS docopt EXPORT ${export_name}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
+else()
# Development package
install(TARGETS docopt_s EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+endif()
install(FILES ${docopt_HEADERS} DESTINATION include/docopt)
# CMake Package

View File

@ -1,13 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO docopt/docopt.cpp
REF 7476f8e56b4650aaeafb4e1cda2e5d8f01fddd97
SHA512 6765e8a3a834ad75bd87effee5ac7e174482039d26015346b95d7d64e4e0097cc3f1f2e6fd9e3e5970bf4c5719095c0a3e5edfac18217913dc88fbe569d37ae8
REF 400e6dd8e59196c914dcc2c56caf7dae7efa5eb3
SHA512 a9ef466ba40127f636bc20beb7508c4da2dc32c0c37acb5729644f31d4910d9c0253f311457f39ed57605775e72f3370aff4e5ef88e60a49d190bc4760c40ea3
HEAD_REF master
PATCHES
001-fix-unresolved-symbol.patch
002-fix-install-path.patch
install-one-flavor.patch
)
vcpkg_cmake_configure(
@ -21,6 +17,7 @@ vcpkg_cmake_configure(
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/docopt)
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
@ -36,8 +33,6 @@ file(COPY
DESTINATION "${CURRENT_PACKAGES_DIR}/include/docopt")
# Handle copyright
file(INSTALL
"${SOURCE_PATH}/LICENSE-MIT"
DESTINATION "${CURRENT_PACKAGES_DIR}/share/docopt" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-MIT" "${SOURCE_PATH}/LICENSE-Boost-1.0")
vcpkg_copy_pdbs()

View File

@ -1,8 +1,8 @@
{
"name": "docopt",
"version-date": "2018-11-01",
"port-version": 3,
"version-date": "2022-03-15",
"description": "Command line arguments parser that will make you smile (C++11 port).",
"license": "MIT OR BSL-1.0",
"dependencies": [
{
"name": "vcpkg-cmake",

View File

@ -2277,8 +2277,8 @@
"port-version": 0
},
"docopt": {
"baseline": "2018-11-01",
"port-version": 3
"baseline": "2022-03-15",
"port-version": 0
},
"doctest": {
"baseline": "2.4.11",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "98cead1c88cad77bef9acf4571d6bd8a2a06cf3a",
"version-date": "2022-03-15",
"port-version": 0
},
{
"git-tree": "a18c91830f3f709c03b3d0e245f404e8cf7a99c3",
"version-date": "2018-11-01",