diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-07-05 18:07:34 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-07-13 14:31:16 +0200 |
| commit | adfb767bcc21a54e916d99d35c04845e76aae43d (patch) | |
| tree | a7e5a9c6095910db2b568b66adeacd8353ba3d46 /cmake/QtBuild.cmake | |
| parent | 3c88e12beb22d8ea11b8a7006a71ba9773c6d183 (diff) | |
Move the logic associated with platform definition directory
Since platform definition directory is used as an interface include
path of the Qt::Platform target, it makes sense to define it for this
target only. Also the definition of cached values that contain
path to platform definition looks redundand.
The definition of QT_PLATFORM_DEFINITION_DIR from command line
doesn't make any sense since build procedure doesn't take it into
account when installing mkspecs and the use if the user-provided
QT_PLATFORM_DEFINITION_DIR value as a Qt::Platform include directory
causes inconsistency in the prefixed builds. INSTALL_MKSPECSDIR
and QT_QMAKE_TARGET_MKSPEC should be used instead.
Change-Id: I3636c57b835cb84511a358a0910cc482c5fbd81e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtBuild.cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 24245178a5..f89512ae58 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -372,30 +372,6 @@ else() set(QT_QMAKE_HOST_MKSPEC "${QT_QMAKE_TARGET_MKSPEC}") endif() -# Used by consumers of prefix builds via INSTALL_INTERFACE (relative path). -set(QT_DEFAULT_PLATFORM_DEFINITION_DIR "${INSTALL_MKSPECSDIR}/${QT_QMAKE_TARGET_MKSPEC}") - -# Used by qtbase in prefix builds via BUILD_INTERFACE -set(QT_PLATFORM_DEFINITION_BUILD_INTERFACE_BASE_DIR - "${CMAKE_CURRENT_LIST_DIR}/../mkspecs/" -) - -# Used by qtbase and consumers in non-prefix builds via BUILD_INTERFACE -if(NOT QT_WILL_INSTALL) - set(QT_PLATFORM_DEFINITION_BUILD_INTERFACE_BASE_DIR - "${QT_BUILD_DIR}/${INSTALL_MKSPECSDIR}" - ) -endif() - -get_filename_component(QT_PLATFORM_DEFINITION_BUILD_INTERFACE_DIR - "${QT_PLATFORM_DEFINITION_BUILD_INTERFACE_BASE_DIR}/${QT_QMAKE_TARGET_MKSPEC}" - ABSOLUTE -) -set(QT_PLATFORM_DEFINITION_BUILD_INTERFACE_DIR - "${QT_PLATFORM_DEFINITION_BUILD_INTERFACE_DIR}" - CACHE INTERNAL "Path to directory that contains qplatformdefs.h" -) - if(NOT EXISTS "${QT_MKSPECS_DIR}/${QT_QMAKE_TARGET_MKSPEC}") file(GLOB known_platforms LIST_DIRECTORIES true @@ -413,8 +389,6 @@ endif() set(QT_PLATFORM_DEFINITIONS ${QT_DEFAULT_PLATFORM_DEFINITIONS} CACHE STRING "Qt platform specific pre-processor defines") -set(QT_PLATFORM_DEFINITION_DIR "${QT_DEFAULT_PLATFORM_DEFINITION_DIR}" - CACHE PATH "Path to directory that contains qplatformdefs.h") set(QT_NAMESPACE "" CACHE STRING "Qt Namespace") |