[cli11] Update to 2.4.2 (#38805)

And fixes https://github.com/microsoft/vcpkg/issues/38804, direct use
with MSVS.
This commit is contained in:
Kai Pastor 2024-05-22 12:30:50 +02:00 committed by GitHub
parent 62f8f89a51
commit 2fd62b5d87
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 3 deletions

View File

@ -2,8 +2,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CLIUtils/CLI11
REF "v${VERSION}"
SHA512 965290d09977672d3bc3c57ca4b89a88c2c09461da6e866b18217d702d4d5a0977588fcb8fef1a3c3804e61ad80d276029f47469cc83dbfdc7021ee35f6b7269
SHA512 fdb61c430f5b99a9495fda7f94bfc8d0fb5360c99beeccbcb3b8918713579aac97fa0dcbce296065d9043f141a538c505919c9810fd1d192661e8b48b6a2637a
HEAD_REF main
PATCHES
revert-1012-pkgconfig.diff
)
vcpkg_cmake_configure(
@ -21,4 +23,6 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/CLI11)
vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/CLI/CLI.hpp" "#pragma once" "#pragma once\n#ifndef CLI11_COMPILE\n#define CLI11_COMPILE\n#endif")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

View File

@ -0,0 +1,10 @@
diff --git a/cmake/CLI11GeneratePkgConfig.cmake b/cmake/CLI11GeneratePkgConfig.cmake
index 7ed87f077..a9c5eb885 100644
--- a/cmake/CLI11GeneratePkgConfig.cmake
+++ b/cmake/CLI11GeneratePkgConfig.cmake
@@ -4,4 +4,4 @@ else()
configure_file("cmake/CLI11.pc.in" "CLI11.pc" @ONLY)
endif()
-install(FILES "${PROJECT_BINARY_DIR}/CLI11.pc" DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig")
+install(FILES "${PROJECT_BINARY_DIR}/CLI11.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")

View File

@ -1,6 +1,6 @@
{
"name": "cli11",
"version": "2.4.1",
"version": "2.4.2",
"description": "CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface.",
"homepage": "https://github.com/CLIUtils/CLI11",
"license": "BSD-3-Clause",

View File

@ -1677,7 +1677,7 @@
"port-version": 0
},
"cli11": {
"baseline": "2.4.1",
"baseline": "2.4.2",
"port-version": 0
},
"clickhouse-cpp": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "06ac9dc66d709da4eabe20f952b83b4bb7ae7dda",
"version": "2.4.2",
"port-version": 0
},
{
"git-tree": "05a104e144c6cfa16b0a896502ef96f3ccbbdddc",
"version": "2.4.1",