summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-04-15 14:22:28 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-04-15 14:22:28 (GMT)
commit4966c62f316de1ea8e6af53f0dc85686c7d56c3d (patch)
treec4e665315b35b39318a4083afcfe6cb729cf052e
parent1ce673a88ba2284af22a90d2619096beb0ea9dc6 (diff)
parent73721c7ce0dc8fc9ee07fe70746aa44284390d89 (diff)
downloadCMake-4966c62f316de1ea8e6af53f0dc85686c7d56c3d.zip
CMake-4966c62f316de1ea8e6af53f0dc85686c7d56c3d.tar.gz
CMake-4966c62f316de1ea8e6af53f0dc85686c7d56c3d.tar.bz2
Merge topic 'CMakeDetermineVSServicePack-warn-deprecated'
73721c7c CMakeDetermineVSServicePack: Add deprecation diagnostic
-rw-r--r--Help/release/dev/CMakeDetermineVSServicePack.rst6
-rw-r--r--Modules/CMakeDetermineVSServicePack.cmake7
2 files changed, 13 insertions, 0 deletions
diff --git a/Help/release/dev/CMakeDetermineVSServicePack.rst b/Help/release/dev/CMakeDetermineVSServicePack.rst
new file mode 100644
index 0000000..d9d7b41
--- /dev/null
+++ b/Help/release/dev/CMakeDetermineVSServicePack.rst
@@ -0,0 +1,6 @@
+CMakeDetermineVSServicePack
+---------------------------
+
+* The :module:`CMakeDetermineVSServicePack` module now warns that
+ it is deprecated and should not longer be used. Use the
+ :variable:`CMAKE_<LANG>_COMPILER_VERSION` variable instead.
diff --git a/Modules/CMakeDetermineVSServicePack.cmake b/Modules/CMakeDetermineVSServicePack.cmake
index 2854387..6886084 100644
--- a/Modules/CMakeDetermineVSServicePack.cmake
+++ b/Modules/CMakeDetermineVSServicePack.cmake
@@ -43,6 +43,13 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
+if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.8)
+ message(DEPRECATION
+ "This module is deprecated and should not be used. "
+ "Use the CMAKE_<LANG>_COMPILER_VERSION variable instead."
+ )
+endif()
+
# [INTERNAL]
# Please do not call this function directly
function(_DetermineVSServicePackFromCompiler _OUT_VAR _cl_version)