[gflags] Cleanup, fix usage (#35188)

* [gflags] Make find_package more regular

* [gflags] portfile cleanup

* [gflags] Fix pkgconfig

* Versions

* [gflags] Add license

* [gflags] Legacy quirks
This commit is contained in:
Kai Pastor 2023-11-22 03:51:28 +01:00 committed by GitHub
parent ce8fd9e724
commit a44d019a38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 20 deletions

View File

@ -19,15 +19,14 @@ vcpkg_cmake_configure(
-DGFLAGS_REGISTER_BUILD_DIR:BOOL=OFF
-DGFLAGS_REGISTER_INSTALL_PREFIX:BOOL=OFF
-DBUILD_gflags_nothreads_LIB:BOOL=OFF
-DGFLAGS_USE_TARGET_NAMESPACE:BOOL=ON
-DCMAKE_DEBUG_POSTFIX=d
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gflags)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin")
if(NOT VCPKG_TARGET_IS_WINDOWS)
vcpkg_fixup_pkgconfig()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gflags.pc" "-lgflags" "-lgflags_debug")
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
@ -35,8 +34,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.txt")
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()

View File

@ -1,4 +1,5 @@
The package gflags provides CMake targets:
gflags provides CMake targets:
set(GFLAGS_USE_TARGET_NAMESPACE ON)
find_package(gflags CONFIG REQUIRED)
target_link_libraries(main PRIVATE gflags::gflags)

View File

@ -1,10 +1,7 @@
set(GFLAGS_USE_TARGET_NAMESPACE ON)
if(NOT DEFINED GFLAGS_USE_TARGET_NAMESPACE)
# vcpkg legacy
set(GFLAGS_USE_TARGET_NAMESPACE ON)
_find_package(${ARGS})
unset(GFLAGS_USE_TARGET_NAMESPACE)
endif()
_find_package(${ARGS})
foreach(tgt gflags gflags_shared gflags_static)
if (NOT TARGET ${tgt} AND TARGET "gflags::${tgt}")
add_library(${tgt} INTERFACE IMPORTED)
target_link_libraries(${tgt} INTERFACE "gflags::${tgt}")
endif()
endforeach(tgt)

View File

@ -1,9 +1,10 @@
{
"name": "gflags",
"version": "2.2.2",
"port-version": 7,
"port-version": 8,
"description": "A C++ library that implements commandline flags processing",
"homepage": "https://github.com/gflags/gflags",
"license": "BSD-3-Clause",
"supports": "!uwp",
"dependencies": [
{

View File

@ -2930,7 +2930,7 @@
},
"gflags": {
"baseline": "2.2.2",
"port-version": 7
"port-version": 8
},
"ghc-filesystem": {
"baseline": "1.5.14",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "606a0a3ad49f6e6276672e230431e6797d56180e",
"version": "2.2.2",
"port-version": 8
},
{
"git-tree": "1c57a920065312afe80b1b8a3595f82005da61ee",
"version": "2.2.2",