diff options
Diffstat (limited to 'meta/recipes-devtools/cmake')
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch | 55 |
2 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 6144d51be4..014ff5a750 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc | |||
| @@ -15,6 +15,7 @@ SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz | |||
| 15 | file://support-oe-qt4-tools-names.patch \ | 15 | file://support-oe-qt4-tools-names.patch \ |
| 16 | file://aarch64-cmake.patch \ | 16 | file://aarch64-cmake.patch \ |
| 17 | file://aarch64-kwsys.patch \ | 17 | file://aarch64-kwsys.patch \ |
| 18 | file://qt4-fail-silent.patch \ | ||
| 18 | " | 19 | " |
| 19 | 20 | ||
| 20 | inherit autotools | 21 | inherit autotools |
diff --git a/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch b/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch new file mode 100644 index 0000000000..fd39f3f9e7 --- /dev/null +++ b/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch | |||
| @@ -0,0 +1,55 @@ | |||
| 1 | Fail silently if system Qt installation is broken | ||
| 2 | |||
| 3 | Fixes a regression in behaviour from 2.8.10 to 2.8.11 resulting in the | ||
| 4 | following error if the system Qt installation is broken: | ||
| 5 | |||
| 6 | CMake Error at Modules/FindQt4.cmake:1028 (set_property): | ||
| 7 | set_property could not find TARGET Qt4::QtCore. Perhaps it has not yet | ||
| 8 | been created. | ||
| 9 | Call Stack (most recent call first): | ||
| 10 | Tests/RunCMake/CMakeLists.txt:79 (find_package) | ||
| 11 | |||
| 12 | Upstream-Status: Pending | ||
| 13 | |||
| 14 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
| 15 | |||
| 16 | --- cmake-2.8.11/Modules/FindQt4.cmake 2013-07-04 10:20:42.092848274 +0100 | ||
| 17 | +++ cmake-2.8.11/Modules/FindQt4.cmake 2013-07-04 10:52:15.693380555 +0100 | ||
| 18 | @@ -1025,21 +1025,22 @@ | ||
| 19 | set(_configs) | ||
| 20 | endmacro() | ||
| 21 | |||
| 22 | - | ||
| 23 | - # Set QT_xyz_LIBRARY variable and add | ||
| 24 | - # library include path to QT_INCLUDES | ||
| 25 | - _QT4_ADJUST_LIB_VARS(QtCore) | ||
| 26 | - set_property(TARGET Qt4::QtCore APPEND PROPERTY | ||
| 27 | - INTERFACE_INCLUDE_DIRECTORIES | ||
| 28 | - "${QT_MKSPECS_DIR}/default" | ||
| 29 | - ${QT_INCLUDE_DIR} | ||
| 30 | - ) | ||
| 31 | - set_property(TARGET Qt4::QtCore PROPERTY | ||
| 32 | - INTERFACE_QT_MAJOR_VERSION 4 | ||
| 33 | - ) | ||
| 34 | - set_property(TARGET Qt4::QtCore APPEND PROPERTY | ||
| 35 | - COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION | ||
| 36 | - ) | ||
| 37 | + if(QT_QTCORE_FOUND) | ||
| 38 | + # Set QT_xyz_LIBRARY variable and add | ||
| 39 | + # library include path to QT_INCLUDES | ||
| 40 | + _QT4_ADJUST_LIB_VARS(QtCore) | ||
| 41 | + set_property(TARGET Qt4::QtCore APPEND PROPERTY | ||
| 42 | + INTERFACE_INCLUDE_DIRECTORIES | ||
| 43 | + "${QT_MKSPECS_DIR}/default" | ||
| 44 | + ${QT_INCLUDE_DIR} | ||
| 45 | + ) | ||
| 46 | + set_property(TARGET Qt4::QtCore PROPERTY | ||
| 47 | + INTERFACE_QT_MAJOR_VERSION 4 | ||
| 48 | + ) | ||
| 49 | + set_property(TARGET Qt4::QtCore APPEND PROPERTY | ||
| 50 | + COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION | ||
| 51 | + ) | ||
| 52 | + endif() | ||
| 53 | |||
| 54 | foreach(QT_MODULE ${QT_MODULES}) | ||
| 55 | _QT4_ADJUST_LIB_VARS(${QT_MODULE}) | ||