From 5dc2f378a79a6cef8bb57c0ac72e3f9868098ef5 Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Thu, 30 Mar 2023 16:13:25 -0500 Subject: [PATCH] [libkml] explicitly set C++ standard as it uses removed features (#30526) * [libkml] explicitly set C++ standard as it uses features that were removed in C++17 * ./vcpkg x-add-version --all --- ports/libkml/portfile.cmake | 3 +++ ports/libkml/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libkml.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/libkml/portfile.cmake b/ports/libkml/portfile.cmake index c501759901..7ab2fddb3d 100644 --- a/ports/libkml/portfile.cmake +++ b/ports/libkml/portfile.cmake @@ -28,6 +28,9 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_POLICY_DEFAULT_CMP0022=NEW + # libkml uses std::unary_function that was deprecated in C++11 and removed in C++17 + # compilers are starting to ship C++17 as the defualt so explicitly set C++11 + -DCMAKE_CXX_STANDARD=11 ) vcpkg_cmake_install() diff --git a/ports/libkml/vcpkg.json b/ports/libkml/vcpkg.json index e9301fcae4..f0ffc0b296 100644 --- a/ports/libkml/vcpkg.json +++ b/ports/libkml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libkml", "version": "1.3.0", - "port-version": 11, + "port-version": 12, "description": "Reference implementation of OGC KML 2.2", "homepage": "https://github.com/libkml/libkml", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 84d7bddc44..08f874d601 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4106,7 +4106,7 @@ }, "libkml": { "baseline": "1.3.0", - "port-version": 11 + "port-version": 12 }, "liblas": { "baseline": "1.8.1", diff --git a/versions/l-/libkml.json b/versions/l-/libkml.json index 8196268bb1..b5da596311 100644 --- a/versions/l-/libkml.json +++ b/versions/l-/libkml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84ea1bd884a5d5afee127b15e73ef5bb7ba638dc", + "version": "1.3.0", + "port-version": 12 + }, { "git-tree": "4969a3e81df3ef13b5e3f2f94e652311df8bbafe", "version": "1.3.0",