diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2021-02-07 11:24:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-07 11:24:58 +0100 |
| commit | 5366db1b15d6152b77fff0d8a78b99a6ecf7d306 (patch) | |
| tree | 0e4bc35d925166ba3ab3f695ff79ad723abc7ac1 | |
| parent | 197ea0569bc39651a5c7a216bfbe1e674a099c84 (diff) | |
| parent | 2ceb24ce207d1ae4c187d79dddd236f80cb47f3f (diff) | |
| download | PROJ-5366db1b15d6152b77fff0d8a78b99a6ecf7d306.tar.gz PROJ-5366db1b15d6152b77fff0d8a78b99a6ecf7d306.zip | |
Merge pull request #2511 from mwtoews/remove-cmake-configurations-8.0
CMake: remove old configuration option aliases
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 13 |
2 files changed, 0 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 344823ee..c4ed49f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -259,12 +259,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) |