From acd4adc7ccabbe86a12526a09e1df50f8396a3da Mon Sep 17 00:00:00 2001 From: Ben Lubar Date: Thu, 8 Mar 2018 02:28:28 -0600 Subject: [PATCH 1/3] Fix CMake warning about CMP0022 policy being set as "OLD". --- library/CMakeLists.txt | 8 +++----- plugins/stonesense | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 4d4a4e9f1..8b4712c73 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -1,10 +1,8 @@ PROJECT (dfapi) -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.12) # prevent CMake warnings about INTERFACE_LINK_LIBRARIES vs LINK_INTERFACE_LIBRARIES -IF(CMAKE_VERSION VERSION_GREATER "2.8.12") - CMAKE_POLICY(SET CMP0022 OLD) -ENDIF() +CMAKE_POLICY(SET CMP0022 NEW) ## build options OPTION(BUILD_DEVEL "Install/package files required for development (For SDK)." OFF) @@ -365,7 +363,7 @@ IF(APPLE) ENDIF() TARGET_LINK_LIBRARIES(dfhack protobuf-lite clsocket lua jsoncpp dfhack-version ${PROJECT_LIBS}) -SET_TARGET_PROPERTIES(dfhack PROPERTIES LINK_INTERFACE_LIBRARIES "") +SET_TARGET_PROPERTIES(dfhack PROPERTIES INTERFACE_LINK_LIBRARIES "") TARGET_LINK_LIBRARIES(dfhack-client protobuf-lite clsocket) TARGET_LINK_LIBRARIES(dfhack-run dfhack-client) diff --git a/plugins/stonesense b/plugins/stonesense index 031bf4caa..5482849c5 160000 --- a/plugins/stonesense +++ b/plugins/stonesense @@ -1 +1 @@ -Subproject commit 031bf4caafec321dd315202a83539d052ed49d84 +Subproject commit 5482849c52dfac9f8200af3827d16bfb3fabb899 From 4ca12621a237bb216e9d48badf4c39f9433fa4c2 Mon Sep 17 00:00:00 2001 From: Ben Lubar Date: Thu, 8 Mar 2018 11:38:46 -0600 Subject: [PATCH 2/3] Remove remaining CMP0022 usage --- CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 58be5dff1..17cf86a0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,5 @@ # main project file. use it from a build sub-folder, see COMPILE for details -# prevent CMake warnings about INTERFACE_LINK_LIBRARIES vs LINK_INTERFACE_LIBRARIES -IF(CMAKE_VERSION VERSION_GREATER "2.8.12") - CMAKE_POLICY(SET CMP0022 OLD) -ENDIF() - # Set up build types if(CMAKE_CONFIGURATION_TYPES) SET(CMAKE_CONFIGURATION_TYPES Release RelWithDebInfo) From c260996d6186b9386f6dfa820df33fcc1ca7f99d Mon Sep 17 00:00:00 2001 From: Ben Lubar Date: Thu, 8 Mar 2018 12:26:10 -0600 Subject: [PATCH 3/3] Update required CMake version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17cf86a0b..bb3ab92cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ endif(CMAKE_CONFIGURATION_TYPES) OPTION(BUILD_DOCS "Choose whether to build the documentation (requires python and Sphinx)." OFF) ## some generic CMake magic -cmake_minimum_required(VERSION 2.8 FATAL_ERROR) +cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) project(dfhack) macro(CHECK_GCC COMPILER_PATH)