[Cmake-commits] CMake branch, next, updated. v2.8.12-3711-gfc35df7

[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  fc35df70f29a4a92611431b466c7152167697dd7 (commit)
       via  2ee00edb278e4e84e54fe52e406184231359c8cc (commit)
       via  415f9fca57421191992c502c6a36c45b076a7309 (commit)
      from  48599d068041afce8fa3b8ea643c6d90fff36a43 (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=fc35df70f29a4a92611431b466c7152167697dd7
commit fc35df70f29a4a92611431b466c7152167697dd7
Merge: 48599d0 2ee00ed
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 8 12:22:30 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 8 12:22:30 2013 -0400

    Merge topic 'deprecation-message' into next
    
    2ee00ed GenerateExportHeader: Port to use message(DEPRECATION)
    415f9fc Use new DEPRECTATION message type.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ee00edb278e4e84e54fe52e406184231359c8cc
commit 2ee00edb278e4e84e54fe52e406184231359c8cc
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:21:02 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=415f9fca57421191992c502c6a36c45b076a7309
commit 415f9fca57421191992c502c6a36c45b076a7309
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 8 18:12:53 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 8 18:21:02 2013 +0200

    Use new DEPRECTATION message type.

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index bb5d011..74bad89 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -468,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/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:
 Modules/GenerateExportHeader.cmake                 |   10 +---------
 Modules/Qt4Macros.cmake                            |   10 +---------
 .../UseModulesMacro-WARN-stderr.txt                |    2 +-
 3 files changed, 3 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
CMake