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

Merge topic 'obsolete-qt4-macros' 

cb7f32f Mark qt4_use_modules and qt4_automoc as obsolete.
This commit is contained in:
Brad King 2013-07-16 13:59:22 -04:00 committed by CMake Topic Stage
parent 3573a94d72 cb7f32f5b8
commit 9c119b829d
12 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/FindQt4.cmake
View File

@ -100,6 +100,7 @@
# because you need a custom filename for the moc file or something similar. # because you need a custom filename for the moc file or something similar.
# #
# macro QT4_AUTOMOC(sourcefile1 sourcefile2 ... ) # macro QT4_AUTOMOC(sourcefile1 sourcefile2 ... )
# The qt4_automoc macro is obsolete. Use the CMAKE_AUTOMOC feature instead.
# This macro is still experimental. # This macro is still experimental.
# It can be used to have moc automatically handled. # It can be used to have moc automatically handled.
# So if you have the files foo.h and foo.cpp, and in foo.h a # So if you have the files foo.h and foo.cpp, and in foo.h a
@ -174,6 +175,7 @@
# must exist and are not updated in any way. # must exist and are not updated in any way.
# #
# function QT4_USE_MODULES( target [link_type] modules...) # function QT4_USE_MODULES( target [link_type] modules...)
# This function is obsolete. Use target_link_libraries with IMPORTED targets instead.
# Make <target> use the <modules> from Qt. Using a Qt module means # Make <target> use the <modules> from Qt. Using a Qt module means
# to link to the library, add the relevant include directories for the module, # to link to the library, add the relevant include directories for the module,
# and add the relevant compiler defines for using the module. # and add the relevant compiler defines for using the module.

22
Modules/Qt4Macros.cmake
View File

@ -357,6 +357,17 @@ endmacro()
macro(QT4_AUTOMOC) 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()
endif()
QT4_GET_MOC_FLAGS(_moc_INCS) QT4_GET_MOC_FLAGS(_moc_INCS)
set(_matching_FILES ) set(_matching_FILES )
@ -467,6 +478,17 @@ macro(QT4_ADD_TRANSLATION _qm_files)
endmacro() 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(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()
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})
set(link_type ${_link_type}) set(link_type ${_link_type})

4
Tests/RunCMake/CMakeLists.txt
View File

@ -104,6 +104,10 @@ find_package(Qt5Core QUIET)
if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0) if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0)
add_RunCMake_test(IncompatibleQt) add_RunCMake_test(IncompatibleQt)
endif() endif()
if (QT4_FOUND)
set(ObsoleteQtMacros_ARGS -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
add_RunCMake_test(ObsoleteQtMacros)
endif()
if("${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [^6]") if("${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [^6]")
add_RunCMake_test(include_external_msproject) add_RunCMake_test(include_external_msproject)

1
Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-result.txt Normal file
View File

@ -0,0 +1 @@
0

5
Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt Normal file
View File

@ -0,0 +1,5 @@
CMake 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\)
CMakeLists.txt:3 \(include\)

7
Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN.cmake Normal file
View File

@ -0,0 +1,7 @@
find_package(Qt4 REQUIRED)
set(CMAKE_WARN_DEPRECATED 1)
add_library(foo SHARED empty.cpp)
qt4_automoc(foo_moc_srcs empty.cpp)

3
Tests/RunCMake/ObsoleteQtMacros/CMakeLists.txt Normal file
View File

@ -0,0 +1,3 @@
cmake_minimum_required(VERSION 2.8.11)
project(${RunCMake_TEST})
include(${RunCMake_TEST}.cmake)

6
Tests/RunCMake/ObsoleteQtMacros/RunCMakeTest.cmake Normal file
View File

@ -0,0 +1,6 @@
include(RunCMake)
set(RunCMake_TEST_OPTIONS -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
run_cmake(UseModulesMacro-WARN)
run_cmake(AutomocMacro-WARN)

1
Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-result.txt Normal file
View File

@ -0,0 +1 @@
0

6
Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt Normal file
View File

@ -0,0 +1,6 @@
CMake 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\):
UseModulesMacro-WARN.cmake:[^ ]+ \(qt4_use_modules\)
CMakeLists.txt:3 \(include\)

7
Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN.cmake Normal file
View File

@ -0,0 +1,7 @@
find_package(Qt4 REQUIRED)
set(CMAKE_WARN_DEPRECATED 1)
add_library(foo SHARED empty.cpp)
qt4_use_modules(foo LINK_PRIVATE Core)

7
Tests/RunCMake/ObsoleteQtMacros/empty.cpp Normal file
View File

@ -0,0 +1,7 @@
#ifdef _WIN32
__declspec(dllexport)
#endif
int empty(void)
{
return 0;
}