From d31c9d9ac16ac3f041167e8545e74fb2cdfa8e42 Mon Sep 17 00:00:00 2001 From: Bogdan Bucur Date: Wed, 30 Jun 2021 18:21:37 +0100 Subject: [PATCH 01/10] fixed glog / gflags dependency --- ports/gflags/CONTROL | 7 ++++-- ports/gflags/portfile.cmake | 8 +++++++ ports/gflags/vcpkg-cmake-wrapper.cmake.in | 4 ++++ ports/glog/CONTROL | 2 +- ports/glog/fix-gflags-target.patch | 27 +++++++++++++++++++++++ ports/glog/portfile.cmake | 1 + versions/baseline.json | 8 +++---- 7 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 ports/gflags/vcpkg-cmake-wrapper.cmake.in create mode 100644 ports/glog/fix-gflags-target.patch diff --git a/ports/gflags/CONTROL b/ports/gflags/CONTROL index f2b9307789644a..6855f269cb122b 100644 --- a/ports/gflags/CONTROL +++ b/ports/gflags/CONTROL @@ -1,5 +1,8 @@ Source: gflags -Version: 2.2.2-1 +Version: 2.2.2-2 Homepage: https://github.com/gflags/gflags Description: A C++ library that implements commandline flags processing -Supports: !uwp \ No newline at end of file +Supports: !uwp + +Feature: target-namespace +Description: Enables the gflags:: target namespace \ No newline at end of file diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index 82f651351f8a37..d035cdeb3bd14a 100644 --- a/ports/gflags/portfile.cmake +++ b/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,8 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +set(_GFLAGS_USE_TARGET_NAMESPACE ${GFLAGS_USE_TARGET_NAMESPACE}) +configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in ${CURRENT_PACKAGES_DIR}/share/gflags/vcpkg-cmake-wrapper.cmake @ONLY) file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gflags RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/gflags/vcpkg-cmake-wrapper.cmake.in b/ports/gflags/vcpkg-cmake-wrapper.cmake.in new file mode 100644 index 00000000000000..2c6ac2e57c5d00 --- /dev/null +++ b/ports/gflags/vcpkg-cmake-wrapper.cmake.in @@ -0,0 +1,4 @@ +set(GFLAGS_USE_TARGET_NAMESPACE @_GFLAGS_USE_TARGET_NAMESPACE@) + +_find_package(${ARGS}) + diff --git a/ports/glog/CONTROL b/ports/glog/CONTROL index 649381e3812c29..31fe6e5fc4f96a 100644 --- a/ports/glog/CONTROL +++ b/ports/glog/CONTROL @@ -1,5 +1,5 @@ Source: glog -Version: 0.4.0-3 +Version: 0.4.0-4 Homepage: https://github.com/google/glog Description: C++ implementation of the Google logging module Build-Depends: gflags diff --git a/ports/glog/fix-gflags-target.patch b/ports/glog/fix-gflags-target.patch new file mode 100644 index 00000000000000..db79ef1308aecf --- /dev/null +++ b/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 diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index 8487cc19219055..d2fe8fd4a4658c 100644 --- a/ports/glog/portfile.cmake +++ b/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( diff --git a/versions/baseline.json b/versions/baseline.json index 0848eb077935b3..3a5c386178000f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2253,7 +2253,7 @@ "port-version": 0 }, "gflags": { - "baseline": "2.2.2-1", + "baseline": "2.2.2-2", "port-version": 0 }, "ghc-filesystem": { @@ -2317,7 +2317,7 @@ "port-version": 4 }, "glog": { - "baseline": "0.4.0-3", + "baseline": "0.4.0-4", "port-version": 0 }, "gloo": { @@ -3539,8 +3539,8 @@ "libsigcpp-3": { "baseline": "3.0.3", "port-version": 1 - }, - "libsmb2": { + }, + "libsmb2": { "baseline": "2021-04-29", "port-version": 0 }, From 3fce672a21f1e952ddd9ab172d031d37803979a3 Mon Sep 17 00:00:00 2001 From: Bogdan Bucur Date: Wed, 30 Jun 2021 18:22:26 +0100 Subject: [PATCH 02/10] bumped versions --- versions/g-/gflags.json | 5 +++++ versions/g-/glog.json | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/versions/g-/gflags.json b/versions/g-/gflags.json index 93fbb9bf9d0e18..582c44eab422a7 100644 --- a/versions/g-/gflags.json +++ b/versions/g-/gflags.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2443da9e4f4ad5b21af4a2bd285c5596153798a0", + "version-string": "2.2.2-2", + "port-version": 0 + }, { "git-tree": "7dd635d5295af145f4601ba13219aa0d84630f27", "version-string": "2.2.2-1", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index 7cb107996df647..c688b0412e475e 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f13f356599ab36476c5d45df57b9c4c9b3ca979", + "version-string": "0.4.0-4", + "port-version": 0 + }, { "git-tree": "ec7f01875b20c7145088d5ec7a1927a5faea5ca6", "version-string": "0.4.0-3", From 7b5c2369b62b54874857c5b1ee935999bb1c29bf Mon Sep 17 00:00:00 2001 From: bucurb Date: Thu, 1 Jul 2021 11:27:24 +0100 Subject: [PATCH 03/10] Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/gflags/CONTROL | 5 +++-- ports/gflags/portfile.cmake | 2 +- ports/glog/CONTROL | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ports/gflags/CONTROL b/ports/gflags/CONTROL index 6855f269cb122b..5f0ca8b976da03 100644 --- a/ports/gflags/CONTROL +++ b/ports/gflags/CONTROL @@ -1,8 +1,9 @@ Source: gflags -Version: 2.2.2-2 +Version: 2.2.2 +Port-Version: 2 Homepage: https://github.com/gflags/gflags Description: A C++ library that implements commandline flags processing Supports: !uwp Feature: target-namespace -Description: Enables the gflags:: target namespace \ No newline at end of file +Description: Enables the gflags:: target namespace diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index d035cdeb3bd14a..d010a4b482d175 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -41,6 +41,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) set(_GFLAGS_USE_TARGET_NAMESPACE ${GFLAGS_USE_TARGET_NAMESPACE}) configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in ${CURRENT_PACKAGES_DIR}/share/gflags/vcpkg-cmake-wrapper.cmake @ONLY) -file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gflags RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/glog/CONTROL b/ports/glog/CONTROL index 31fe6e5fc4f96a..081e35bfb2946b 100644 --- a/ports/glog/CONTROL +++ b/ports/glog/CONTROL @@ -1,5 +1,6 @@ Source: glog -Version: 0.4.0-4 +Version: 0.4.0 +Port-Version: 4 Homepage: https://github.com/google/glog Description: C++ implementation of the Google logging module Build-Depends: gflags From abad105e468b6b9d72821b1d9917aa9f31a88f77 Mon Sep 17 00:00:00 2001 From: Bogdan Bucur Date: Thu, 1 Jul 2021 13:40:49 +0100 Subject: [PATCH 04/10] updated sha --- versions/baseline.json | 8 ++++---- versions/g-/gflags.json | 5 +++++ versions/g-/glog.json | 5 +++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 3a5c386178000f..5e3e970aa167b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2253,8 +2253,8 @@ "port-version": 0 }, "gflags": { - "baseline": "2.2.2-2", - "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-4", - "port-version": 0 + "baseline": "0.4.0", + "port-version": 4 }, "gloo": { "baseline": "20201203", diff --git a/versions/g-/gflags.json b/versions/g-/gflags.json index 582c44eab422a7..93c5055c2e0a34 100644 --- a/versions/g-/gflags.json +++ b/versions/g-/gflags.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "200f50b894441509b0a234b8b6f5c1ac911023ed", + "version-string": "2.2.2", + "port-version": 2 + }, { "git-tree": "2443da9e4f4ad5b21af4a2bd285c5596153798a0", "version-string": "2.2.2-2", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index c688b0412e475e..ff09a3d6b7e77d 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "95365ce5afff7ba5ad40dadd9bedd3cbd72d0cf4", + "version-string": "0.4.0", + "port-version": 4 + }, { "git-tree": "8f13f356599ab36476c5d45df57b9c4c9b3ca979", "version-string": "0.4.0-4", From c1b7ead43f5ceccba07645bbab3b4daf2e410917 Mon Sep 17 00:00:00 2001 From: Bogdan Bucur Date: Thu, 8 Jul 2021 13:34:15 +0100 Subject: [PATCH 05/10] PR comments --- ports/gflags/portfile.cmake | 10 ++++++++-- ports/gflags/usage.in | 4 ++++ versions/g-/gflags.json | 5 ----- versions/g-/glog.json | 5 ----- 4 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 ports/gflags/usage.in diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index d010a4b482d175..a545c4e5180416 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -40,7 +40,13 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) set(_GFLAGS_USE_TARGET_NAMESPACE ${GFLAGS_USE_TARGET_NAMESPACE}) -configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in ${CURRENT_PACKAGES_DIR}/share/gflags/vcpkg-cmake-wrapper.cmake @ONLY) -file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +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() diff --git a/ports/gflags/usage.in b/ports/gflags/usage.in new file mode 100644 index 00000000000000..5a043d2e92e0e4 --- /dev/null +++ b/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@) diff --git a/versions/g-/gflags.json b/versions/g-/gflags.json index 93c5055c2e0a34..e0c5b9b3950e7f 100644 --- a/versions/g-/gflags.json +++ b/versions/g-/gflags.json @@ -5,11 +5,6 @@ "version-string": "2.2.2", "port-version": 2 }, - { - "git-tree": "2443da9e4f4ad5b21af4a2bd285c5596153798a0", - "version-string": "2.2.2-2", - "port-version": 0 - }, { "git-tree": "7dd635d5295af145f4601ba13219aa0d84630f27", "version-string": "2.2.2-1", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index ff09a3d6b7e77d..56de56a07b0f08 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -5,11 +5,6 @@ "version-string": "0.4.0", "port-version": 4 }, - { - "git-tree": "8f13f356599ab36476c5d45df57b9c4c9b3ca979", - "version-string": "0.4.0-4", - "port-version": 0 - }, { "git-tree": "ec7f01875b20c7145088d5ec7a1927a5faea5ca6", "version-string": "0.4.0-3", From 7b00a5f8a16793a90b7049ef8464ab8c825a9d01 Mon Sep 17 00:00:00 2001 From: Bogdan Bucur Date: Thu, 8 Jul 2021 13:35:34 +0100 Subject: [PATCH 06/10] sha --- versions/g-/gflags.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/gflags.json b/versions/g-/gflags.json index e0c5b9b3950e7f..59b9bc5a11899a 100644 --- a/versions/g-/gflags.json +++ b/versions/g-/gflags.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "200f50b894441509b0a234b8b6f5c1ac911023ed", + "git-tree": "265d2b1bda3bd1d21ad89666a3dbd928499153c0", "version-string": "2.2.2", "port-version": 2 }, From e272d4aa30d33c41996cc1dbbba10be2f785ae42 Mon Sep 17 00:00:00 2001 From: Bogdan Bucur Date: Wed, 4 Aug 2021 14:00:04 +0100 Subject: [PATCH 07/10] PR comments --- ports/gflags/CONTROL | 3 --- ports/gflags/portfile.cmake | 17 +++----------- ports/gflags/{usage.in => usage} | 2 +- ports/gflags/vcpkg-cmake-wrapper.cmake | 9 ++++++++ ports/gflags/vcpkg-cmake-wrapper.cmake.in | 4 ---- ports/glog/CONTROL | 3 +-- ports/glog/fix-gflags-target.patch | 27 ----------------------- ports/glog/portfile.cmake | 1 - versions/baseline.json | 4 ++-- versions/g-/glog.json | 5 ----- 10 files changed, 16 insertions(+), 59 deletions(-) rename ports/gflags/{usage.in => usage} (56%) create mode 100644 ports/gflags/vcpkg-cmake-wrapper.cmake delete mode 100644 ports/gflags/vcpkg-cmake-wrapper.cmake.in delete mode 100644 ports/glog/fix-gflags-target.patch diff --git a/ports/gflags/CONTROL b/ports/gflags/CONTROL index 5f0ca8b976da03..2e57f50df684d4 100644 --- a/ports/gflags/CONTROL +++ b/ports/gflags/CONTROL @@ -4,6 +4,3 @@ Port-Version: 2 Homepage: https://github.com/gflags/gflags Description: A C++ library that implements commandline flags processing Supports: !uwp - -Feature: target-namespace -Description: Enables the gflags:: target namespace diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index a545c4e5180416..e0d9e1dab01d2d 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -13,12 +13,6 @@ 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 @@ -26,6 +20,7 @@ vcpkg_configure_cmake( -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 ) @@ -39,14 +34,8 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -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 "${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_copy_pdbs() diff --git a/ports/gflags/usage.in b/ports/gflags/usage similarity index 56% rename from ports/gflags/usage.in rename to ports/gflags/usage index 5a043d2e92e0e4..67fb74789b6786 100644 --- a/ports/gflags/usage.in +++ b/ports/gflags/usage @@ -1,4 +1,4 @@ The package gflags provides CMake targets: find_package(gflags CONFIG REQUIRED) - target_link_libraries(main PRIVATE @_GFLAGS_TARGET_NAME@) + target_link_libraries(main PRIVATE gflags::gflags) diff --git a/ports/gflags/vcpkg-cmake-wrapper.cmake b/ports/gflags/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..f401356da39bfb --- /dev/null +++ b/ports/gflags/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,9 @@ +set(GFLAGS_USE_TARGET_NAMESPACE ON) + +_find_package(${ARGS}) + +foreach(tgt gflags gflags_shared gflags_static) + if (NOT TARGET ${tgt} AND TARGET "gflags::${tgt}") + add_library(${tgt} ALIAS "gflags::${tgt}") + endif() +endforeach(tgt) diff --git a/ports/gflags/vcpkg-cmake-wrapper.cmake.in b/ports/gflags/vcpkg-cmake-wrapper.cmake.in deleted file mode 100644 index 2c6ac2e57c5d00..00000000000000 --- a/ports/gflags/vcpkg-cmake-wrapper.cmake.in +++ /dev/null @@ -1,4 +0,0 @@ -set(GFLAGS_USE_TARGET_NAMESPACE @_GFLAGS_USE_TARGET_NAMESPACE@) - -_find_package(${ARGS}) - diff --git a/ports/glog/CONTROL b/ports/glog/CONTROL index 081e35bfb2946b..649381e3812c29 100644 --- a/ports/glog/CONTROL +++ b/ports/glog/CONTROL @@ -1,6 +1,5 @@ Source: glog -Version: 0.4.0 -Port-Version: 4 +Version: 0.4.0-3 Homepage: https://github.com/google/glog Description: C++ implementation of the Google logging module Build-Depends: gflags diff --git a/ports/glog/fix-gflags-target.patch b/ports/glog/fix-gflags-target.patch deleted file mode 100644 index db79ef1308aecf..00000000000000 --- a/ports/glog/fix-gflags-target.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index d2fe8fd4a4658c..8487cc19219055 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -6,7 +6,6 @@ vcpkg_from_github( HEAD_REF master PATCHES glog_disable_debug_postfix.patch - fix-gflags-target.patch ) vcpkg_configure_cmake( diff --git a/versions/baseline.json b/versions/baseline.json index 20bb2bda7f4c4c..5dfdd755414225 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2329,8 +2329,8 @@ "port-version": 4 }, "glog": { - "baseline": "0.4.0", - "port-version": 4 + "baseline": "0.4.0-3", + "port-version": 0 }, "gloo": { "baseline": "20201203", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index 56de56a07b0f08..7cb107996df647 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "95365ce5afff7ba5ad40dadd9bedd3cbd72d0cf4", - "version-string": "0.4.0", - "port-version": 4 - }, { "git-tree": "ec7f01875b20c7145088d5ec7a1927a5faea5ca6", "version-string": "0.4.0-3", From 3634e4d0ae7e4f9171ecebe8f4c6a1b5958b4d3d Mon Sep 17 00:00:00 2001 From: Bogdan Bucur Date: Wed, 4 Aug 2021 14:00:40 +0100 Subject: [PATCH 08/10] sha --- versions/g-/gflags.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/gflags.json b/versions/g-/gflags.json index 59b9bc5a11899a..8d728992acb970 100644 --- a/versions/g-/gflags.json +++ b/versions/g-/gflags.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "265d2b1bda3bd1d21ad89666a3dbd928499153c0", + "git-tree": "7be1ab177fce40e480399f20a62004afdbb24e5a", "version-string": "2.2.2", "port-version": 2 }, From 7d2e5821db7865f55ee2752808f1ef621351aec1 Mon Sep 17 00:00:00 2001 From: Bogdan Bucur Date: Wed, 4 Aug 2021 14:03:19 +0100 Subject: [PATCH 09/10] cosmetics --- ports/gflags/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/gflags/CONTROL b/ports/gflags/CONTROL index 2e57f50df684d4..fec8eeb0ff7662 100644 --- a/ports/gflags/CONTROL +++ b/ports/gflags/CONTROL @@ -3,4 +3,4 @@ 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 \ No newline at end of file From 277293d35aea7150d1615f15eca0239adf44fc3d Mon Sep 17 00:00:00 2001 From: Bogdan Bucur Date: Wed, 4 Aug 2021 14:03:46 +0100 Subject: [PATCH 10/10] sha --- versions/g-/gflags.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/gflags.json b/versions/g-/gflags.json index 8d728992acb970..aa9065db094e7d 100644 --- a/versions/g-/gflags.json +++ b/versions/g-/gflags.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7be1ab177fce40e480399f20a62004afdbb24e5a", + "git-tree": "1e2bb870b1e3592591d62f396378e25b2678d80c", "version-string": "2.2.2", "port-version": 2 },