[glog] Fixed gflags dependency

ports/gflags/CONTROL

@@ -1,5 +1,9 @@
 Source: gflags
-Version: 2.2.2-1
+Version: 2.2.2
+Port-Version: 2
 Homepage: https://github.com/gflags/gflags
 Description: A C++ library that implements commandline flags processing
-Supports: !uwp
+Supports: !uwp
+
+Feature: target-namespace
+Description: Enables the gflags:: target namespace

ports/gflags/portfile.cmake

@@ -13,6 +13,12 @@ vcpkg_from_github(
         fix_cmake_config.patch
 )
 
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        "target-namespace" GFLAGS_USE_TARGET_NAMESPACE
+)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -33,6 +39,14 @@ endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
-file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gflags RENAME copyright)
+set(_GFLAGS_USE_TARGET_NAMESPACE ${GFLAGS_USE_TARGET_NAMESPACE})
+set(_GFLAGS_TARGET_NAME "gflags")
+if ("${GFLAGS_USE_TARGET_NAMESPACE}")
+    set(_GFLAGS_TARGET_NAME "gflags::${_GFLAGS_TARGET_NAME}")
+endif()
+
+configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
+configure_file("${CMAKE_CURRENT_LIST_DIR}/usage.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
+file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 vcpkg_copy_pdbs()

ports/gflags/usage.in

@@ -0,0 +1,4 @@
+The package gflags provides CMake targets:
+
+    find_package(gflags CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE @_GFLAGS_TARGET_NAME@)

ports/gflags/vcpkg-cmake-wrapper.cmake.in

@@ -0,0 +1,4 @@
+set(GFLAGS_USE_TARGET_NAMESPACE @_GFLAGS_USE_TARGET_NAMESPACE@)
+
+_find_package(${ARGS})
+

ports/glog/CONTROL

@@ -1,5 +1,6 @@
 Source: glog
-Version: 0.4.0-3
+Version: 0.4.0
+Port-Version: 4
 Homepage: https://github.com/google/glog
 Description: C++ implementation of the Google logging module
 Build-Depends: gflags

ports/glog/fix-gflags-target.patch

@@ -0,0 +1,27 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 808330e..acfb9f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,6 +49,13 @@ set (CMAKE_THREAD_PREFER_PTHREAD 1)
+
+ if (WITH_GFLAGS)
+   find_package (gflags 2.2.0)
++  
++  # Find a target
++  foreach (_GFLAGS_TARGET gflags gflags::gflags)
++    if (TARGET _GFLAGS_TARGET)
++      set(GFLAGS_TARGET _GFLAGS_TARGET)
++    endif()
++  endforeach (_GFLAGS_TARGET)
+
+   if (gflags_FOUND)
+     set (HAVE_LIB_GFLAGS 1)
+@@ -489,7 +496,7 @@ if (WIN32 AND HAVE_SNPRINTF)
+ endif (WIN32 AND HAVE_SNPRINTF)
+
+ if (gflags_FOUND)
+-  target_link_libraries (glog PUBLIC gflags)
++  target_link_libraries (glog PUBLIC ${GFLAGS_TARGET})
+
+   if (NOT BUILD_SHARED_LIBS)
+     # Don't use __declspec(dllexport|dllimport) if this is a static build

ports/glog/portfile.cmake

@@ -6,6 +6,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
        glog_disable_debug_postfix.patch
+       fix-gflags-target.patch
 )
 
 vcpkg_configure_cmake(

versions/baseline.json

@@ -2253,8 +2253,8 @@
       "port-version": 0
     },
     "gflags": {
-      "baseline": "2.2.2-1",
-      "port-version": 0
+      "baseline": "2.2.2",
+      "port-version": 2
     },
     "ghc-filesystem": {
       "baseline": "1.5.4",
@@ -2317,8 +2317,8 @@
       "port-version": 4
     },
     "glog": {
-      "baseline": "0.4.0-3",
-      "port-version": 0
+      "baseline": "0.4.0",
+      "port-version": 4
     },
     "gloo": {
       "baseline": "20201203",
@@ -3539,8 +3539,8 @@
     "libsigcpp-3": {
       "baseline": "3.0.3",
       "port-version": 1
-    }, 
-	"libsmb2": {
+    },
+    "libsmb2": {
       "baseline": "2021-04-29",
       "port-version": 0
     },

versions/g-/gflags.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "265d2b1bda3bd1d21ad89666a3dbd928499153c0",
+      "version-string": "2.2.2",
+      "port-version": 2
+    },
     {
       "git-tree": "7dd635d5295af145f4601ba13219aa0d84630f27",
       "version-string": "2.2.2-1",

versions/g-/glog.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "95365ce5afff7ba5ad40dadd9bedd3cbd72d0cf4",
+      "version-string": "0.4.0",
+      "port-version": 4
+    },
     {
       "git-tree": "ec7f01875b20c7145088d5ec7a1927a5faea5ca6",
       "version-string": "0.4.0-3",