From 606ad23e026a978eeab23954a963d221e8e38818 Mon Sep 17 00:00:00 2001 From: Nicolas Hake Date: Mon, 31 Dec 2018 11:34:18 +0100 Subject: [PATCH] CMake: Deprecate CMAKE_ADDITIONAL_DEPS_PATH The variable completely duplicates a different one and also intrudes on CMake's own namespace. It should therefore be removed when possible. --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b52f29a12..cc2e75d2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # OpenClonk, http://www.openclonk.org # -# Copyright (c) 2009-2016, The OpenClonk Team and contributors +# Copyright (c) 2009-2018, The OpenClonk Team and contributors # # Distributed under the terms of the ISC license; see accompanying file # "COPYING" for details. @@ -35,8 +35,10 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") include(Version) -set(CMAKE_ADDITIONAL_DEPS_PATH "${CMAKE_CURRENT_BINARY_DIR}/deps" CACHE PATH "Additional directory to search for libraries and headers") -list(APPEND CMAKE_PREFIX_PATH ${CMAKE_ADDITIONAL_DEPS_PATH}) +if(DEFINED CMAKE_ADDITIONAL_DEPS_PATH) + message(WARNING "CMAKE_ADDITIONAL_DEPS_PATH is deprecated and will be removed in a future version. Set CMAKE_PREFIX_PATH instead.") + set(CMAKE_PREFIX_PATH ${CMAKE_ADDITIONAL_DEPS_PATH}) +endif() ############################################################################ # User selectable options