[Cmake-commits] CMake branch, next, updated. v2.8.12-3714-gc92ced8

[Stephen Kelly]

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  c92ced87277375154760873b1b7949235b035855 (commit)
       via  f973737305aaa48ddf26f4455bdc8acdd7d03573 (commit)
       via  f69606d3354701c2e4ef4ed0718802e1fa6b7fd5 (commit)
      from  fc35df70f29a4a92611431b466c7152167697dd7 (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=c92ced87277375154760873b1b7949235b035855
commit c92ced87277375154760873b1b7949235b035855
Merge: fc35df7 f973737
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 8 12:24:13 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 8 12:24:13 2013 -0400

    Merge topic 'deprecation-message' into next
    
    f973737 GenerateExportHeader: Port to use message(DEPRECATION)
    f69606d Qt4Macros: Port to use message(DEPRECATION)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f973737305aaa48ddf26f4455bdc8acdd7d03573
commit f973737305aaa48ddf26f4455bdc8acdd7d03573
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 8 18:14:21 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 8 18:23:42 2013 +0200

    GenerateExportHeader: Port to use message(DEPRECATION)

diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index b2fda09..fb113a7 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -337,15 +337,7 @@ endfunction()
 
 function(add_compiler_export_flags)
   if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
-    if(CMAKE_WARN_DEPRECATED)
-      set(messageType WARNING)
-    endif()
-    if(CMAKE_ERROR_DEPRECATED)
-      set(messageType FATAL_ERROR)
-    endif()
-    if(messageType)
-      message(${messageType} "The add_compiler_export_flags function is obsolete. Use the CXX_VISIBILITY_PRESET and VISIBILITY_INLINES_HIDDEN target properties instead.")
-    endif()
+    message(DEPRECATION "The add_compiler_export_flags function is obsolete. Use the CXX_VISIBILITY_PRESET and VISIBILITY_INLINES_HIDDEN target properties instead.")
   endif()
 
   _test_compiler_hidden_visibility()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f69606d3354701c2e4ef4ed0718802e1fa6b7fd5
commit f69606d3354701c2e4ef4ed0718802e1fa6b7fd5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Sep 17 19:11:39 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 8 18:23:42 2013 +0200

    Qt4Macros: Port to use message(DEPRECATION)

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index f1aedd7..74bad89 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)
 
@@ -476,15 +468,7 @@ endmacro()
 
 function(qt4_use_modules _target _link_type)
   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_use_modules function is obsolete. Use target_link_libraries with IMPORTED targets instead.")
-    endif()
+    message(DEPRECATION "The qt4_use_modules function is obsolete. Use target_link_libraries with IMPORTED targets instead.")
   endif()
   if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE")
     set(modules ${ARGN})
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\)
diff --git a/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt b/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
index b90c665..c69af65 100644
--- a/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
+++ b/Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
@@ -1,4 +1,4 @@
-CMake Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
+CMake Deprecation Warning at .*/Modules/Qt4Macros.cmake:[^ ]+ \(message\):
   The qt4_use_modules function is obsolete.  Use target_link_libraries with
   IMPORTED targets instead.
 Call Stack \(most recent call first\):

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake