[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4227-g5335a80
Stephen Kelly
steveire at gmail.com
Wed Sep 18 08:08:58 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 5335a803c7744c9db349c48a9ba947386f1f902a (commit)
via 3e781fc912d839e52a5c6368a003491b6d945b55 (commit)
via d700e3b248fdedfed4a64840aa6c4d2eb0593311 (commit)
from 92ed4595d3627c6499143ebef7efc0de396a8c44 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5335a803c7744c9db349c48a9ba947386f1f902a
commit 5335a803c7744c9db349c48a9ba947386f1f902a
Merge: 92ed459 3e781fc
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 18 08:08:53 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 18 08:08:53 2013 -0400
Merge topic 'deprecation-message' into next
3e781fc Port Qt4Macros to the new DEPRECATION message.
d700e3b Add a new message type for deprecation.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e781fc912d839e52a5c6368a003491b6d945b55
commit 3e781fc912d839e52a5c6368a003491b6d945b55
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 17 19:11:39 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Sep 18 14:08:25 2013 +0200
Port Qt4Macros to the new DEPRECATION message.
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index f1aedd7..bb5d011 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -355,15 +355,7 @@ endmacro()
macro(QT4_AUTOMOC)
if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11)
- if(CMAKE_WARN_DEPRECATED)
- set(messageType WARNING)
- endif()
- if(CMAKE_ERROR_DEPRECATED)
- set(messageType FATAL_ERROR)
- endif()
- if(messageType)
- message(${messageType} "The qt4_automoc macro is obsolete. Use the CMAKE_AUTOMOC feature instead.")
- endif()
+ message(DEPRECATION "The qt4_automoc macro is obsolete. Use the CMAKE_AUTOMOC feature instead.")
endif()
QT4_GET_MOC_FLAGS(_moc_INCS)
diff --git a/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt b/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
index 6f7e8ee..f358cc4 100644
--- a/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
+++ b/Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
@@ -1,4 +1,4 @@
-CMake Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
+CMake Deprecation Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
The qt4_automoc macro is obsolete. Use the CMAKE_AUTOMOC feature instead.
Call Stack \(most recent call first\):
AutomocMacro-WARN.cmake:7 \(qt4_automoc\)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d700e3b248fdedfed4a64840aa6c4d2eb0593311
commit d700e3b248fdedfed4a64840aa6c4d2eb0593311
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 17 18:54:34 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Sep 18 14:06:26 2013 +0200
Add a new message type for deprecation.
By default, the message is not issued. If CMAKE_ERROR_DEPRECATED
is on, the message is fatal. If CMAKE_WARN_DEPRECATED is on, the
message is a warning.
diff --git a/Source/cmMessageCommand.cxx b/Source/cmMessageCommand.cxx
index e1dbf34..d85e720 100644
--- a/Source/cmMessageCommand.cxx
+++ b/Source/cmMessageCommand.cxx
@@ -52,6 +52,23 @@ bool cmMessageCommand
status = true;
++i;
}
+ else if (*i == "DEPRECATION")
+ {
+ if (this->Makefile->IsOn("CMAKE_ERROR_DEPRECATED"))
+ {
+ fatal = true;
+ type = cmake::DEPRECATION_ERROR;
+ }
+ else if (this->Makefile->IsOn("CMAKE_WARN_DEPRECATED"))
+ {
+ type = cmake::DEPRECATION_WARNING;
+ }
+ else
+ {
+ return true;
+ }
+ ++i;
+ }
for(;i != args.end(); ++i)
{
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 290aff0..2a4240a 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -4489,6 +4489,15 @@ void cmake::IssueMessage(cmake::MessageType t, std::string const& text,
{
msg << "CMake Debug Log";
}
+ else if(t == cmake::DEPRECATION_ERROR)
+ {
+ msg << "CMake Deprecation Error";
+ isError = true;
+ }
+ else if (t == cmake::DEPRECATION_WARNING)
+ {
+ msg << "CMake Deprecation Warning";
+ }
else
{
msg << "CMake Warning";
diff --git a/Source/cmake.h b/Source/cmake.h
index a50c1ed..c28896f 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -65,7 +65,9 @@ class cmake
INTERNAL_ERROR,
MESSAGE,
WARNING,
- LOG
+ LOG,
+ DEPRECATION_ERROR,
+ DEPRECATION_WARNING
};
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index e45aba3..cc52e9e 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -119,3 +119,4 @@ endif()
add_RunCMake_test(File_Generate)
add_RunCMake_test(ExportWithoutLanguage)
add_RunCMake_test(target_link_libraries)
+add_RunCMake_test(deprecation)
diff --git a/Tests/RunCMake/deprecation/CMakeLists.txt b/Tests/RunCMake/deprecation/CMakeLists.txt
new file mode 100644
index 0000000..12cd3c7
--- /dev/null
+++ b/Tests/RunCMake/deprecation/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8.4)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/deprecation/RunCMakeTest.cmake b/Tests/RunCMake/deprecation/RunCMakeTest.cmake
new file mode 100644
index 0000000..d2bc0c3
--- /dev/null
+++ b/Tests/RunCMake/deprecation/RunCMakeTest.cmake
@@ -0,0 +1,5 @@
+include(RunCMake)
+
+run_cmake(nomessage)
+run_cmake(warnmessage)
+run_cmake(errormessage)
diff --git a/Tests/RunCMake/deprecation/errormessage-result.txt b/Tests/RunCMake/deprecation/errormessage-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/deprecation/errormessage-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/deprecation/errormessage-stderr.txt b/Tests/RunCMake/deprecation/errormessage-stderr.txt
new file mode 100644
index 0000000..49e7ca9
--- /dev/null
+++ b/Tests/RunCMake/deprecation/errormessage-stderr.txt
@@ -0,0 +1,4 @@
+CMake Deprecation Error at errormessage.cmake:4 \(message\):
+ This is an error
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/deprecation/errormessage.cmake b/Tests/RunCMake/deprecation/errormessage.cmake
new file mode 100644
index 0000000..7d3b779
--- /dev/null
+++ b/Tests/RunCMake/deprecation/errormessage.cmake
@@ -0,0 +1,4 @@
+
+set(CMAKE_ERROR_DEPRECATED ON)
+
+message(DEPRECATION "This is an error")
diff --git a/Tests/RunCMake/deprecation/nomessage-result.txt b/Tests/RunCMake/deprecation/nomessage-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/deprecation/nomessage-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/deprecation/nomessage-stderr.txt b/Tests/RunCMake/deprecation/nomessage-stderr.txt
new file mode 100644
index 0000000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/deprecation/nomessage-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/deprecation/nomessage.cmake b/Tests/RunCMake/deprecation/nomessage.cmake
new file mode 100644
index 0000000..bcc97be
--- /dev/null
+++ b/Tests/RunCMake/deprecation/nomessage.cmake
@@ -0,0 +1,2 @@
+
+message(DEPRECATION "This is not issued")
diff --git a/Tests/RunCMake/deprecation/warnmessage-result.txt b/Tests/RunCMake/deprecation/warnmessage-result.txt
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/Tests/RunCMake/deprecation/warnmessage-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/deprecation/warnmessage-stderr.txt b/Tests/RunCMake/deprecation/warnmessage-stderr.txt
new file mode 100644
index 0000000..5c44566
--- /dev/null
+++ b/Tests/RunCMake/deprecation/warnmessage-stderr.txt
@@ -0,0 +1,4 @@
+CMake Deprecation Warning at warnmessage.cmake:4 \(message\):
+ This is a warning
+Call Stack \(most recent call first\):
+ CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/deprecation/warnmessage.cmake b/Tests/RunCMake/deprecation/warnmessage.cmake
new file mode 100644
index 0000000..4c421a1
--- /dev/null
+++ b/Tests/RunCMake/deprecation/warnmessage.cmake
@@ -0,0 +1,4 @@
+
+set(CMAKE_WARN_DEPRECATED ON)
+
+message(DEPRECATION "This is a warning")
-----------------------------------------------------------------------
Summary of changes:
Modules/Qt4Macros.cmake | 10 +---------
Source/cmMessageCommand.cxx | 17 +++++++++++++++++
Source/cmake.cxx | 9 +++++++++
Source/cmake.h | 4 +++-
Tests/RunCMake/CMakeLists.txt | 1 +
.../ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt | 2 +-
.../{CMP0004 => deprecation}/CMakeLists.txt | 0
Tests/RunCMake/deprecation/RunCMakeTest.cmake | 5 +++++
.../errormessage-result.txt} | 0
Tests/RunCMake/deprecation/errormessage-stderr.txt | 4 ++++
Tests/RunCMake/deprecation/errormessage.cmake | 4 ++++
.../nomessage-result.txt} | 0
.../nomessage-stderr.txt} | 0
Tests/RunCMake/deprecation/nomessage.cmake | 2 ++
.../warnmessage-result.txt} | 0
Tests/RunCMake/deprecation/warnmessage-stderr.txt | 4 ++++
Tests/RunCMake/deprecation/warnmessage.cmake | 4 ++++
17 files changed, 55 insertions(+), 11 deletions(-)
copy Tests/RunCMake/{CMP0004 => deprecation}/CMakeLists.txt (100%)
create mode 100644 Tests/RunCMake/deprecation/RunCMakeTest.cmake
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => deprecation/errormessage-result.txt} (100%)
create mode 100644 Tests/RunCMake/deprecation/errormessage-stderr.txt
create mode 100644 Tests/RunCMake/deprecation/errormessage.cmake
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-static-result.txt => deprecation/nomessage-result.txt} (100%)
copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-static-link_libraries-stderr.txt => deprecation/nomessage-stderr.txt} (100%)
create mode 100644 Tests/RunCMake/deprecation/nomessage.cmake
copy Tests/RunCMake/{CMP0022/CMP0022-WARN-static-result.txt => deprecation/warnmessage-result.txt} (100%)
create mode 100644 Tests/RunCMake/deprecation/warnmessage-stderr.txt
create mode 100644 Tests/RunCMake/deprecation/warnmessage.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list