diff options
| author | Alex Merry <alex.merry@kde.org> | 2014-12-24 18:31:05 +0000 |
|---|---|---|
| committer | Alex Merry <alex.merry@kde.org> | 2014-12-28 15:44:35 +0000 |
| commit | 351fe45dba7ac04ec2779b7d761ac55a58f89945 (patch) | |
| tree | 5680ef1ab73d3f435dc09bcc0937ac3f6d3ab242 | |
| parent | 25d2b72789090e99b0059784827e43a1a82aeafb (diff) | |
| download | extra-cmake-modules-351fe45dba7ac04ec2779b7d761ac55a58f89945.tar.gz extra-cmake-modules-351fe45dba7ac04ec2779b7d761ac55a58f89945.tar.bz2 | |
Add deprecation warnings for old-style variables.
REVIEW: 121646
| -rw-r--r-- | kde-modules/KDEInstallDirs.cmake | 10 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index e4378dca..7a569a94 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -251,8 +251,12 @@ macro(_define_relative varname parent subdir docstring) set(_cmakename) if(NOT KDE_INSTALL_DIRS_NO_CMAKE_VARIABLES) list(FIND _gnu_install_dirs_vars "${varname}" _list_offset) + set(_cmakename_is_deprecated FALSE) if(NOT KDE_INSTALL_DIRS_NO_DEPRECATED OR NOT _list_offset EQUAL -1) set(_cmakename CMAKE_INSTALL_${varname}) + if(_list_offset EQUAL -1) + set(_cmakename_is_deprecated TRUE) + endif() endif() endif() @@ -277,6 +281,9 @@ macro(_define_relative varname parent subdir docstring) endif() if(${_oldstylename}) + if(NOT CMAKE_VERSION VERSION_LESS 3.0.0) + message(DEPRECATION "${_oldstylename} is deprecated, use KDE_INSTALL_${varname} instead.") + endif() # The old name was given (probably on the command line): move # it to the new name set(KDE_INSTALL_${varname} "${${_oldstylename}}" @@ -288,6 +295,9 @@ macro(_define_relative varname parent subdir docstring) unset(${_cmakename} CACHE) endif() elseif(${_cmakename}) + if(_cmakename_is_deprecated AND NOT CMAKE_VERSION VERSION_LESS 3.0.0) + message(DEPRECATION "${_cmakename} is deprecated, use KDE_INSTALL_${varname} instead.") + endif() # The CMAKE_ name was given (probably on the command line): move # it to the new name set(KDE_INSTALL_${varname} "${${_cmakename}}" diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3b83ca16..bc3e5ce8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -42,6 +42,7 @@ add_test_macro(KDEInstallDirsTest.not_cache_variable dummy) set(KDEInstallDirsTest.vars_in_sync_kde_arg_EXTRA_OPTIONS --build-options -DKDE_INSTALL_BINDIR=altbin -DBINDIR_expected_value=altbin + -DCMAKE_WARN_DEPRECATED=TRUE ) add_test_variant(KDEInstallDirsTest.vars_in_sync_kde_arg KDEInstallDirsTest.vars_in_sync dummy) @@ -49,6 +50,7 @@ add_test_variant(KDEInstallDirsTest.vars_in_sync_kde_arg set(KDEInstallDirsTest.vars_in_sync_cmake_arg_EXTRA_OPTIONS --build-options -DCMAKE_INSTALL_BINDIR=altbin -DBINDIR_expected_value=altbin + -DCMAKE_WARN_DEPRECATED=TRUE ) add_test_variant(KDEInstallDirsTest.vars_in_sync_cmake_arg KDEInstallDirsTest.vars_in_sync dummy) @@ -56,6 +58,7 @@ add_test_variant(KDEInstallDirsTest.vars_in_sync_cmake_arg set(KDEInstallDirsTest.vars_in_sync_oldstyle_arg_EXTRA_OPTIONS --build-options -DBIN_INSTALL_DIR=altbin -DBINDIR_expected_value=altbin + -DCMAKE_WARN_DEPRECATED=TRUE ) add_test_variant(KDEInstallDirsTest.vars_in_sync_oldstyle_arg KDEInstallDirsTest.vars_in_sync dummy) |