From a433f115d82a39fbf93bc42d379b906b14483c55 Mon Sep 17 00:00:00 2001
From: Juan Ramos <juan@lunarg.com>
Date: Mon, 13 Nov 2023 12:56:51 -0700
Subject: [PATCH] Update CMake minimum to 3.16.3

Fixes warnings from using find_package(jsoncpp) and simplifies the code
---
 .github/workflows/ci.yml | 31 ++++++++++++++++++++++++++++++
 CMakeLists.txt           | 41 +---------------------------------------
 jsoncppConfig.cmake.in   |  5 -----
 3 files changed, 32 insertions(+), 45 deletions(-)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..9e335a0
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,31 @@
+name: ci
+
+on:
+  push:
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  # Generally speaking the idiom for open source projects is to support
+  # the version of CMake supported by the oldest LTS release.
+  #
+  # Example: Ubuntu-20.04 and Ubuntu-22.04
+  # Ubuntu-20.04's package manager comes with 3.16.3 by default.
+  # This makes boostrapping the build easier for open source development.
+  #
+  # This idiom really only applies to Linux development. Windows/Mac/Android developers
+  # tend to use newer CMake versions due to Visual Studio / Xcode / Android NDK requirements.
+  #
+  # EX: Visual Studio 2022 requires CMake 3.21
+  test-cmake-minimum:
+    name: Test CMake minimum
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: lukka/get-cmake@latest
+        with:
+          cmakeVersion: 3.16.3
+      - run: cmake -S . -B out/ -G Ninja
+      - run: cmake --build out/
+      - run: cmake --install out/ --prefix /tmp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8920544..cd60143 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,44 +1,5 @@
 # vim: et ts=4 sts=4 sw=4 tw=0
-
-# ==== Define cmake build policies that affect compilation and linkage default behaviors
-#
-# Set the JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION string to the newest cmake version
-# policies that provide successful builds. By setting JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION
-# to a value greater than the oldest policies, all policies between
-# JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION and CMAKE_VERSION (used for this build)
-# are set to their NEW behavior, thereby suppressing policy warnings related to policies
-# between the JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION and CMAKE_VERSION.
-#
-# CMake versions greater than the JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION policies will
-# continue to generate policy warnings "CMake Warning (dev)...Policy CMP0XXX is not set:"
-#
-set(JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION "3.8.0")
-set(JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION "3.13.2")
-cmake_minimum_required(VERSION ${JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION})
-if("${CMAKE_VERSION}" VERSION_LESS "${JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION}")
-    #Set and use the newest available cmake policies that are validated to work
-    set(JSONCPP_CMAKE_POLICY_VERSION "${CMAKE_VERSION}")
-else()
-    set(JSONCPP_CMAKE_POLICY_VERSION "${JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION}")
-endif()
-cmake_policy(VERSION ${JSONCPP_CMAKE_POLICY_VERSION})
-if(POLICY CMP0091)
-    cmake_policy(SET CMP0091 NEW)
-endif()
-#
-# Now enumerate specific policies newer than JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION
-# that may need to be individually set to NEW/OLD
-#
-foreach(pnew "") # Currently Empty
-    if(POLICY ${pnew})
-        cmake_policy(SET ${pnew} NEW)
-    endif()
-endforeach()
-foreach(pold "") # Currently Empty
-    if(POLICY ${pold})
-        cmake_policy(SET ${pold} OLD)
-    endif()
-endforeach()
+cmake_minimum_required(VERSION 3.16)
 
 # Build the library with C++11 standard support, independent from other including
 # software which may use a different CXX_STANDARD or CMAKE_CXX_STANDARD.
diff --git a/jsoncppConfig.cmake.in b/jsoncppConfig.cmake.in
index 76570bc..1bee3cd 100644
--- a/jsoncppConfig.cmake.in
+++ b/jsoncppConfig.cmake.in
@@ -1,11 +1,6 @@
-cmake_policy(PUSH)
-cmake_policy(VERSION 3.0)
-
 @PACKAGE_INIT@
 
 include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-targets.cmake" )
 include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-namespaced-targets.cmake" )
 
 check_required_components(JsonCpp)
-
-cmake_policy(POP)