Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 9516fc4260f701c6d9db0c341bb36480362e1747 Mon Sep 17 00:00:00 2001 |
| 2 | From: Otavio Salvador <otavio@ossystems.com.br> |
| 3 | Date: Thu, 5 Jul 2018 10:26:48 -0300 |
| 4 | Subject: [PATCH 4/5] Fail silently if system Qt installation is broken |
| 5 | Organization: O.S. Systems Software LTDA. |
| 6 | |
| 7 | Fixes a regression in behaviour from 2.8.10 to 2.8.11 resulting in the |
| 8 | following error if the system Qt installation is broken: |
| 9 | |
| 10 | CMake Error at Modules/FindQt4.cmake:1028 (set_property): |
| 11 | set_property could not find TARGET Qt4::QtCore. Perhaps it has not yet |
| 12 | been created. |
| 13 | Call Stack (most recent call first): |
| 14 | Tests/RunCMake/CMakeLists.txt:79 (find_package) |
| 15 | |
| 16 | Upstream-Status: Pending |
| 17 | |
| 18 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
| 19 | |
| 20 | The patch was slightly adapted in order to match cmake 3.2.2: |
| 21 | Another set_property was introduced which had to be included |
| 22 | within the if(QT_QTCORE_FOUND) statement. |
| 23 | |
| 24 | Signed-off-by: Moritz Blume <moritz.blume@bmw-carit.de> |
| 25 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
| 26 | --- |
| 27 | Modules/FindQt4.cmake | 39 ++++++++++++++++++++------------------- |
| 28 | 1 file changed, 20 insertions(+), 19 deletions(-) |
| 29 | |
| 30 | diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake |
| 31 | index 7ad981879..8b6f43cda 100644 |
| 32 | --- a/Modules/FindQt4.cmake |
| 33 | +++ b/Modules/FindQt4.cmake |
| 34 | @@ -987,25 +987,26 @@ if (QT_QMAKE_EXECUTABLE AND |
| 35 | endif() |
| 36 | endmacro() |
| 37 | |
| 38 | - |
| 39 | - # Set QT_xyz_LIBRARY variable and add |
| 40 | - # library include path to QT_INCLUDES |
| 41 | - _QT4_ADJUST_LIB_VARS(QtCore) |
| 42 | - set_property(TARGET Qt4::QtCore APPEND PROPERTY |
| 43 | - INTERFACE_INCLUDE_DIRECTORIES |
| 44 | - "${QT_MKSPECS_DIR}/default" |
| 45 | - ${QT_INCLUDE_DIR} |
| 46 | - ) |
| 47 | - set_property(TARGET Qt4::QtCore APPEND PROPERTY |
| 48 | - INTERFACE_COMPILE_DEFINITIONS |
| 49 | - $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> |
| 50 | - ) |
| 51 | - set_property(TARGET Qt4::QtCore PROPERTY |
| 52 | - INTERFACE_QT_MAJOR_VERSION 4 |
| 53 | - ) |
| 54 | - set_property(TARGET Qt4::QtCore APPEND PROPERTY |
| 55 | - COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION |
| 56 | - ) |
| 57 | + if(QT_QTCORE_FOUND) |
| 58 | + # Set QT_xyz_LIBRARY variable and add |
| 59 | + # library include path to QT_INCLUDES |
| 60 | + _QT4_ADJUST_LIB_VARS(QtCore) |
| 61 | + set_property(TARGET Qt4::QtCore APPEND PROPERTY |
| 62 | + INTERFACE_INCLUDE_DIRECTORIES |
| 63 | + "${QT_MKSPECS_DIR}/default" |
| 64 | + ${QT_INCLUDE_DIR} |
| 65 | + ) |
| 66 | + set_property(TARGET Qt4::QtCore APPEND PROPERTY |
| 67 | + INTERFACE_COMPILE_DEFINITIONS |
| 68 | + $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG> |
| 69 | + ) |
| 70 | + set_property(TARGET Qt4::QtCore PROPERTY |
| 71 | + INTERFACE_QT_MAJOR_VERSION 4 |
| 72 | + ) |
| 73 | + set_property(TARGET Qt4::QtCore APPEND PROPERTY |
| 74 | + COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION |
| 75 | + ) |
| 76 | + endif() |
| 77 | |
| 78 | foreach(QT_MODULE ${QT_MODULES}) |
| 79 | _QT4_ADJUST_LIB_VARS(${QT_MODULE}) |
| 80 | -- |
| 81 | 2.18.0 |
| 82 | |