summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-09-17 17:11:39 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-10-08 16:23:42 (GMT)
commitf69606d3354701c2e4ef4ed0718802e1fa6b7fd5 (patch)
treef146c3c2e82f5dc0e9c0737fc624272bf7a7d881 /Modules
parent509c142a3f5ae4c1aa8dfcb4257c63a9e1edc270 (diff)
downloadCMake-f69606d3354701c2e4ef4ed0718802e1fa6b7fd5.zip
CMake-f69606d3354701c2e4ef4ed0718802e1fa6b7fd5.tar.gz
CMake-f69606d3354701c2e4ef4ed0718802e1fa6b7fd5.tar.bz2
Qt4Macros: Port to use message(DEPRECATION)
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Qt4Macros.cmake20
1 files changed, 2 insertions, 18 deletions
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})