From 2ceb24ce207d1ae4c187d79dddd236f80cb47f3f Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Wed, 3 Feb 2021 05:38:59 +1300 Subject: CMake: remove old configuration option aliases --- CMakeLists.txt | 6 ------ src/lib_proj.cmake | 13 ------------- 2 files changed, 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee1444a4..4438fe2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,12 +252,6 @@ set(CMAKECONFIGDIR "${DEFAULT_CMAKEDIR}" ################################################################################ include(CTest) -# Support older option, to be removed by PROJ 8.0 -if(DEFINED PROJ_TESTS) - message(DEPRECATION "PROJ_TESTS has been replaced with BUILD_TESTING") - set(BUILD_TESTING ${PROJ_TESTS}) -endif() - if(BUILD_TESTING) include(ProjTest) else() diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index 95bb222a..367ff976 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -4,13 +4,6 @@ message(STATUS "Configuring proj library:") ### SWITCH BETWEEN STATIC OR SHARED LIBRARY### ############################################## -# Support older option, to be removed by PROJ 8.0 -if(DEFINED BUILD_LIBPROJ_SHARED) - message(DEPRECATION - "BUILD_LIBPROJ_SHARED has been replaced with BUILD_SHARED_LIBS") - set(BUILD_SHARED_LIBS ${BUILD_LIBPROJ_SHARED}) -endif() - # default config is shared, except static on Windows set(BUILD_SHARED_LIBS_DEFAULT ON) if(WIN32) @@ -34,12 +27,6 @@ elseif(USE_THREAD AND NOT Threads_FOUND) "required by USE_THREAD option") endif() -# Support older option, to be removed by PROJ 8.0 -if(DEFINED ENABLE_LTO) - message(DEPRECATION "ENABLE_LTO has been replaced with ENABLE_IPO") - set(ENABLE_IPO ${ENABLE_LTO}) -endif() - option(ENABLE_IPO "Build library with interprocedural optimization (if available)." OFF) if(ENABLE_IPO) -- cgit v1.2.3