kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Qt4Macros: Port to use message(DEPRECATION)

Browse Source
This commit is contained in:
Stephen Kelly 2013-09-17 19:11:39 +02:00
parent 509c142a3f
commit f69606d335
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Modules/Qt4Macros.cmake
View File

@ -355,15 +355,7 @@ endmacro()
macro(QT4_AUTOMOC) macro(QT4_AUTOMOC)
if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11) if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11)
if(CMAKE_WARN_DEPRECATED) message(DEPRECATION "The qt4_automoc macro is obsolete. Use the CMAKE_AUTOMOC feature instead.")
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()
endif() endif()
QT4_GET_MOC_FLAGS(_moc_INCS) QT4_GET_MOC_FLAGS(_moc_INCS)
@ -476,15 +468,7 @@ endmacro()
function(qt4_use_modules _target _link_type) function(qt4_use_modules _target _link_type)
if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11) if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.11)
if(CMAKE_WARN_DEPRECATED) message(DEPRECATION "The qt4_use_modules function is obsolete. Use target_link_libraries with IMPORTED targets instead.")
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()
endif() endif()
if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE") if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE")
set(modules ${ARGN}) set(modules ${ARGN})

2
Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
View File

@ -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. The qt4_automoc macro is obsolete. Use the CMAKE_AUTOMOC feature instead.
Call Stack \(most recent call first\): Call Stack \(most recent call first\):
AutomocMacro-WARN.cmake:7 \(qt4_automoc\) AutomocMacro-WARN.cmake:7 \(qt4_automoc\)

2
Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
View File

@ -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 The qt4_use_modules function is obsolete. Use target_link_libraries with
IMPORTED targets instead. IMPORTED targets instead.
Call Stack \(most recent call first\): Call Stack \(most recent call first\):