From 49f9e8f91a7db23fa6c6c61726b7c0f936624155 Mon Sep 17 00:00:00 2001 From: Gianluca Martino Date: Tue, 18 Mar 2025 12:27:21 +0100 Subject: [PATCH 1/5] Adding cxx17 feature. --- ports/gtest/vcpkg.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/gtest/vcpkg.json b/ports/gtest/vcpkg.json index 0728531f5f54db..5d1c59ae680222 100644 --- a/ports/gtest/vcpkg.json +++ b/ports/gtest/vcpkg.json @@ -13,5 +13,10 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "cxx17": { + "description": "Enable compiler C++17." + } + } } From 9b30fe797c7c840e3f34357448b511b6b4a89cb0 Mon Sep 17 00:00:00 2001 From: Gianluca Martino Date: Tue, 18 Mar 2025 12:30:33 +0100 Subject: [PATCH 2/5] Update portfile.cmake. Enabling C++17 if the feature is selected. --- ports/gtest/portfile.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index 884a19ac77c837..152ac78bdb3b28 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -16,11 +16,17 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" GTEST_FORCE_SHARED_CRT) +set(GTEST_USE_CXX17_OPTION "") +if("cxx17" IN_LIST FEATURES) + set(GTEST_USE_CXX17_OPTION "-DCMAKE_CXX_STANDARD=17") +endif() + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_GMOCK=ON -Dgtest_force_shared_crt=${GTEST_FORCE_SHARED_CRT} + ${GTEST_USE_CXX17_OPTION} ) vcpkg_cmake_install() From b487d85cd24bea2df738023ba30d7e0fd310656b Mon Sep 17 00:00:00 2001 From: Gianluca Martino Date: Tue, 18 Mar 2025 13:21:41 +0100 Subject: [PATCH 3/5] Added new port version. --- versions/g-/gtest.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/versions/g-/gtest.json b/versions/g-/gtest.json index 71f7da92e912a7..420ac7ce47a475 100644 --- a/versions/g-/gtest.json +++ b/versions/g-/gtest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eaa34f86c71fc0fdc87cf875a61cd0fe37a92c97", + "version-semver": "1.16.0", + "port-version": 1 + }, { "git-tree": "7448391582abd4a7d61248894ef2979c8f065813", "version-semver": "1.16.0", From 3cf110b6a513d8db7e2f1442917aa948e9215587 Mon Sep 17 00:00:00 2001 From: Gianluca Martino Date: Thu, 20 Mar 2025 10:48:23 +0100 Subject: [PATCH 4/5] Added port version field. --- ports/gtest/vcpkg.json | 1 + versions/baseline.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/gtest/vcpkg.json b/ports/gtest/vcpkg.json index 5d1c59ae680222..daae374437482f 100644 --- a/ports/gtest/vcpkg.json +++ b/ports/gtest/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gtest", "version-semver": "1.16.0", + "port-version": 1, "description": "Google Testing and Mocking Framework", "homepage": "https://github.com/google/googletest", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index f165815895c977..abd6484a5400f2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3346,7 +3346,7 @@ }, "gtest": { "baseline": "1.16.0", - "port-version": 0 + "port-version": 1 }, "gtk": { "baseline": "4.16.3", From 9bc8863285d9e146ec3863c646404bb2514d12c7 Mon Sep 17 00:00:00 2001 From: Gianluca Martino Date: Thu, 20 Mar 2025 10:49:26 +0100 Subject: [PATCH 5/5] Version git-tree updated. --- versions/g-/gtest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/g-/gtest.json b/versions/g-/gtest.json index 420ac7ce47a475..d2c3043cec19ef 100644 --- a/versions/g-/gtest.json +++ b/versions/g-/gtest.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "eaa34f86c71fc0fdc87cf875a61cd0fe37a92c97", + "git-tree": "6f97e6a042f8662fe76d3905d82ac23a129695b1", "version-semver": "1.16.0", "port-version": 1 },