From aae2fbfc9968759f5955f10cdbb6bba7408eac75 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Thu, 21 Apr 2016 23:12:31 +0800 Subject: [PATCH 1/2] Try to fix cmake CMP0054 warning --- CMakeLists.txt | 4 ++++ example/CMakeLists.txt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bdf484..d315b74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) +if(POLICY CMP0054) + cmake_policy(SET CMP0054 NEW) +endif() + SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules) PROJECT(RapidJSON CXX) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 6da18df..fd0e6eb 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 2.8) +if(POLICY CMP0054) + cmake_policy(SET CMP0054 NEW) +endif() + set(EXAMPLES capitalize condense From 5b6e40df26db79a33cd1974bcdeb6a433c49c003 Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Thu, 21 Apr 2016 23:59:01 +0800 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6de511e..d1c948a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). * Fix a bug in schema minimum/maximum keywords for 64-bit integer (e7149d665941068ccf8c565e77495521331cf390) * Fix a crash bug in regex (#605) * Fix schema "required" keyword cannot handle duplicated keys (#609) +* Fix cmake CMP0054 warning (#612) ### Changed * Clarify problematic JSON license (#392)