From 392b7c5d3399bfa6afe7813268c0ed0d8584535b Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Thu, 17 Jan 2019 19:21:12 -0600 Subject: [PATCH 1/2] STYLE: FATAL_ERROR ignored in cmake_required_minimum since 2.6.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 145a77c15..185385f13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ # set(JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION "3.1.0") set(JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION "3.13.1") -cmake_minimum_required(VERSION ${JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION} FATAL_ERROR) +cmake_minimum_required(VERSION ${JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION}) if("${CMAKE_VERSION}" VERSION_LESS_EQUAL "${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}") From 2db6437b7f68f6a23f182c53f4e1bd67445a9fb6 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Thu, 17 Jan 2019 19:25:06 -0600 Subject: [PATCH 2/2] BUG: VERSION_LESS_EQUAL introduced in cmake 3.7 Older versions of cmake, according to documentation: https://cmake.org/cmake/help/v3.5/command/if.html , do not know VERSION_LESS_EQUAL, just VERSION_LESS. This leads to errors: CMake Error at somewhere/jsoncpp/CMakeLists.txt:18 (if): if given arguments: "3.5.1" "VERSION_LESS_EQUAL" "3.13.1" Unknown arguments specified Resolves: #866 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 185385f13..2de402472 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,9 +13,9 @@ # continue to generate policy warnings "CMake Warning (dev)...Policy CMP0XXX is not set:" # set(JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION "3.1.0") -set(JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION "3.13.1") +set(JSONCPP_NEWEST_VALIDATED_POLICIES_VERSION "3.13.2") cmake_minimum_required(VERSION ${JSONCPP_OLDEST_VALIDATED_POLICIES_VERSION}) -if("${CMAKE_VERSION}" VERSION_LESS_EQUAL "${JSONCPP_NEWEST_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()