Merge branch 'master' into fix/cmake-dll-build-scope

baylesj · web-flow · commit 43157097e271 · 2026-03-15T17:55:30.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@
 # 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_OLDEST_VALIDATED_POLICIES_VERSION "3.10.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}")
diff --git a/version.in b/version.in
@@ -1 +1 @@
-@JSONCPP_VERSION@
+@jsoncpp_VERSION@

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`# CMake versions greater than the JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION policies will`
`13`	`13`	`# continue to generate policy warnings "CMake Warning (dev)...Policy CMP0XXX is not set:"`
`14`	`14`	`#`
`15`		`-set(JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION "3.8.0")`
	`15`	`+set(JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION "3.10.0")`
`16`	`16`	`set(JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION "3.13.2")`
`17`	`17`	`cmake_minimum_required(VERSION ${JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION})`
`18`	`18`	`if("${CMAKE_VERSION}" VERSION_LESS "${JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION}")`