mirror of
https://git.yoctoproject.org/poky
synced 2026-03-17 04:39:40 +01:00
cmake: drop qt4 patches
Qt4 has been dead for a very long time now. (From OE-Core rev: 1552df5351e629f3404540e7f7c94c2478555191) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
46c0699501
commit
3b8477afb2
@@ -17,8 +17,6 @@ LIC_FILES_CHKSUM = "file://Copyright.txt;md5=45025187a129339459b6f1a24f7fac6e \
|
||||
CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
|
||||
|
||||
SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
|
||||
file://0003-cmake-support-OpenEmbedded-Qt4-tool-binary-names.patch \
|
||||
file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "0d9020f06f3ddf17fb537dc228e1a56c927ee506b486f55fe2dc19f69bf0c8db"
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
From 2d02ac91d5a5d72eaddba4894eaa6db3ed8fee62 Mon Sep 17 00:00:00 2001
|
||||
From: Otavio Salvador <otavio@ossystems.com.br>
|
||||
Date: Thu, 12 May 2011 15:36:03 +0000
|
||||
Subject: [PATCH] cmake: support OpenEmbedded Qt4 tool binary names
|
||||
|
||||
The FindQt4 module looks for Qt4 binaries to be able to gather the
|
||||
paths used for compilation and also to be using during other processes
|
||||
(translation update, translation binary generating and like) however
|
||||
OpenEmbedded has renamed those to allow old QMake to be used in
|
||||
parallel with the current one. This patch adds support for the
|
||||
OpenEmbedded specific binary names.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
||||
|
||||
The patch was slightly adapted in order to match cmake 3.2.2:
|
||||
Instead of find_program, _find_qt4_program is now used.
|
||||
|
||||
Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de>
|
||||
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
||||
|
||||
---
|
||||
Modules/FindQt4.cmake | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
|
||||
index 3993968..b2a8585 100644
|
||||
--- a/Modules/FindQt4.cmake
|
||||
+++ b/Modules/FindQt4.cmake
|
||||
@@ -518,7 +518,7 @@ endfunction()
|
||||
|
||||
set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
|
||||
|
||||
-set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac)
|
||||
+set(_QT4_QMAKE_NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac)
|
||||
_qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
|
||||
|
||||
if (QT_QMAKE_EXECUTABLE AND
|
||||
@@ -1136,12 +1136,12 @@ if (QT_QMAKE_EXECUTABLE AND
|
||||
_find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc)
|
||||
_find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic)
|
||||
_find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3)
|
||||
- _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc)
|
||||
- _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml)
|
||||
- _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp)
|
||||
+ _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc4 rcc)
|
||||
+ _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml4 qdbuscpp2xml)
|
||||
+ _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp4 qdbusxml2cpp)
|
||||
_find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate-qt4 lupdate4 lupdate)
|
||||
_find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease-qt4 lrelease4 lrelease)
|
||||
- _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator)
|
||||
+ _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator qcollectiongenerator4)
|
||||
_find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer4 designer)
|
||||
_find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist)
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
From 60864efbe52cc12018efaafbc4e4c3c8b4af2b65 Mon Sep 17 00:00:00 2001
|
||||
From: Otavio Salvador <otavio@ossystems.com.br>
|
||||
Date: Thu, 5 Jul 2018 10:26:48 -0300
|
||||
Subject: [PATCH] Fail silently if system Qt installation is broken
|
||||
|
||||
Fixes a regression in behaviour from 2.8.10 to 2.8.11 resulting in the
|
||||
following error if the system Qt installation is broken:
|
||||
|
||||
CMake Error at Modules/FindQt4.cmake:1028 (set_property):
|
||||
set_property could not find TARGET Qt4::QtCore. Perhaps it has not yet
|
||||
been created.
|
||||
Call Stack (most recent call first):
|
||||
Tests/RunCMake/CMakeLists.txt:79 (find_package)
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
|
||||
The patch was slightly adapted in order to match cmake 3.2.2:
|
||||
Another set_property was introduced which had to be included
|
||||
within the if(QT_QTCORE_FOUND) statement.
|
||||
|
||||
Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de>
|
||||
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
||||
|
||||
---
|
||||
Modules/FindQt4.cmake | 39 ++++++++++++++++++++-------------------
|
||||
1 file changed, 20 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
|
||||
index b2a8585..77c89aa 100644
|
||||
--- a/Modules/FindQt4.cmake
|
||||
+++ b/Modules/FindQt4.cmake
|
||||
@@ -988,25 +988,26 @@ if (QT_QMAKE_EXECUTABLE AND
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
-
|
||||
- # Set QT_xyz_LIBRARY variable and add
|
||||
- # library include path to QT_INCLUDES
|
||||
- _QT4_ADJUST_LIB_VARS(QtCore)
|
||||
- set_property(TARGET Qt4::QtCore APPEND PROPERTY
|
||||
- INTERFACE_INCLUDE_DIRECTORIES
|
||||
- "${QT_MKSPECS_DIR}/default"
|
||||
- ${QT_INCLUDE_DIR}
|
||||
- )
|
||||
- set_property(TARGET Qt4::QtCore APPEND PROPERTY
|
||||
- INTERFACE_COMPILE_DEFINITIONS
|
||||
- $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>
|
||||
- )
|
||||
- set_property(TARGET Qt4::QtCore PROPERTY
|
||||
- INTERFACE_QT_MAJOR_VERSION 4
|
||||
- )
|
||||
- set_property(TARGET Qt4::QtCore APPEND PROPERTY
|
||||
- COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION
|
||||
- )
|
||||
+ if(QT_QTCORE_FOUND)
|
||||
+ # Set QT_xyz_LIBRARY variable and add
|
||||
+ # library include path to QT_INCLUDES
|
||||
+ _QT4_ADJUST_LIB_VARS(QtCore)
|
||||
+ set_property(TARGET Qt4::QtCore APPEND PROPERTY
|
||||
+ INTERFACE_INCLUDE_DIRECTORIES
|
||||
+ "${QT_MKSPECS_DIR}/default"
|
||||
+ ${QT_INCLUDE_DIR}
|
||||
+ )
|
||||
+ set_property(TARGET Qt4::QtCore APPEND PROPERTY
|
||||
+ INTERFACE_COMPILE_DEFINITIONS
|
||||
+ $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>
|
||||
+ )
|
||||
+ set_property(TARGET Qt4::QtCore PROPERTY
|
||||
+ INTERFACE_QT_MAJOR_VERSION 4
|
||||
+ )
|
||||
+ set_property(TARGET Qt4::QtCore APPEND PROPERTY
|
||||
+ COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION
|
||||
+ )
|
||||
+ endif()
|
||||
|
||||
foreach(QT_MODULE ${QT_MODULES})
|
||||
_QT4_ADJUST_LIB_VARS(${QT_MODULE})
|
||||
Reference in New Issue
Block a user