diff options
author | Kai Koehne <kai.koehne@qt.io> | 2020-03-24 16:08:19 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2020-03-25 08:39:43 +0100 |
commit | de67bca44e91616733fb0434100d7cb46ae1d579 (patch) | |
tree | 77e86128fdd78c6de941d7d0b706ed2bd582b000 /src/corelib/Qt6CoreMacros.cmake | |
parent | 5e213a41ce487ae306135993f8e136032decf7de (diff) |
Remove qt6_use_modules
qt5_use_modules has been deprecated in 2013 (commit d9ea4bb144153)
and removed for the first time in 2018, but then brought back - see
discussion in https://lists.qt-project.org/pipermail/development/2018-June/032837.html .
Anyhow, I think we can finally put it to a rest in Qt 6.
Change-Id: I770f7e93406ad68535d1d90e4a3bacfb920e2d5a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib/Qt6CoreMacros.cmake')
-rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 4a1e4a6821..8e9721ef66 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -424,52 +424,6 @@ endif() set(_Qt6_COMPONENT_PATH "${CMAKE_CURRENT_LIST_DIR}/..") -macro(qt6_use_modules _target _link_type) - if(CMAKE_WARN_DEPRECATED) - set(messageType WARNING) - endif() - if(CMAKE_ERROR_DEPRECATED) - set(messageType FATAL_ERROR) - endif() - if(messageType) - message(${messageType} "The qt6_use_modules macro is obsolete. Use target_link_libraries with IMPORTED targets instead.") - endif() - - if (NOT TARGET ${_target}) - message(FATAL_ERROR "The first argument to qt6_use_modules must be an existing target.") - endif() - if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" ) - set(_qt6_modules ${ARGN}) - set(_qt6_link_type ${_link_type}) - else() - set(_qt6_modules ${_link_type} ${ARGN}) - endif() - - if ("${_qt6_modules}" STREQUAL "") - message(FATAL_ERROR "qt6_use_modules requires at least one Qt module to use.") - endif() - - foreach(_module ${_qt6_modules}) - if (NOT Qt6${_module}_FOUND) - find_package(Qt6${_module} PATHS "${_Qt6_COMPONENT_PATH}" NO_DEFAULT_PATH) - if (NOT Qt6${_module}_FOUND) - message(FATAL_ERROR "Cannot use \"${_module}\" module which has not yet been found.") - endif() - endif() - target_link_libraries(${_target} ${_qt6_link_type} ${Qt6${_module}_LIBRARIES}) - set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt6${_module}_INCLUDE_DIRS}) - set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt6${_module}_COMPILE_DEFINITIONS}) - set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE QT_NO_DEBUG) - set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO QT_NO_DEBUG) - set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL QT_NO_DEBUG) - if (Qt6_POSITION_INDEPENDENT_CODE - AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" - OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)) - set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt6_POSITION_INDEPENDENT_CODE}) - endif() - endforeach() -endmacro() - function(add_qt_gui_executable target) if(ANDROID) add_library("${target}" MODULE ${ARGN}) |