From e95aea90e0a8203601a7a5e96f925762bdd758a5 Mon Sep 17 00:00:00 2001 From: expwnent Date: Sun, 27 Sep 2015 04:05:28 -0400 Subject: [PATCH] Fix CMake warning over INTERFACE_LINK_LIBRARIES / policy CMP0022. --- CMakeLists.txt | 7 ++++++- library/CMakeLists.txt | 5 +++++ plugins/stonesense | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 61862c72d..c4f2db27c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,10 @@ # 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) @@ -230,7 +235,7 @@ if (BUILD_DOCS) set_source_files_properties(${SPHINX_OUTPUT} PROPERTIES GENERATED TRUE) add_custom_command(OUTPUT ${SPHINX_OUTPUT} COMMAND ${SPHINX_EXECUTABLE} - -q -b html + -a -E -q -b html -c "${SPHINX_BINARY_BUILD_DIR}" -d "${SPHINX_CACHE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index bca5eaab6..fc0b91e0f 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -1,6 +1,11 @@ PROJECT (dfapi) cmake_minimum_required(VERSION 2.8) +# 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() + ## build options OPTION(BUILD_DEVEL "Install/package files required for development (For SDK)." OFF) OPTION(BUILD_DOXYGEN "Create/install/package doxygen documentation for DFHack (For SDK)." OFF) diff --git a/plugins/stonesense b/plugins/stonesense index 600d171bb..4ba65d9db 160000 --- a/plugins/stonesense +++ b/plugins/stonesense @@ -1 +1 @@ -Subproject commit 600d171bb6eaf44f1a66a379b2f43000d84fab04 +Subproject commit 4ba65d9db72fd48f99df23b92e7e356d7313f6c4