From 0bfe4c49b7a6eb6d400e7f214c5754b7cc21bc04 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Tue, 21 Jun 2016 23:50:33 +0900 Subject: [PATCH 1/2] Set CMP0054 policy to NEW. --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b951296d1..d2cfbd190 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,7 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.8.6) + +CMAKE_POLICY(SET CMP0054 NEW) + PROJECT (msgpack) FILE (READ ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/version_master.h contents) From 45b8d29cc019cc0a550be7d5d17f0d78d79ab6f5 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Wed, 22 Jun 2016 00:20:19 +0900 Subject: [PATCH 2/2] Added CMAKE_VERSION checking. cmake version less than 3.1 doesn't have the policy CMP0054. --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d2cfbd190..2747ae048 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,9 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.8.6) -CMAKE_POLICY(SET CMP0054 NEW) +IF ((CMAKE_VERSION VERSION_GREATER 3.1) OR + (CMAKE_VERSION VERSION_EQUAL 3.1)) + CMAKE_POLICY(SET CMP0054 NEW) +ENDIF () PROJECT (msgpack)