<div dir="ltr">I see this causes piglit to fail to build, which is a problem if we want this in oe-core. I'm having a quick look to see if upgrading piglit helps but right now this is blocking merging.<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 10 June 2015 at 08:36, Moritz Blume <span dir="ltr"><<a href="mailto:moritz.blume@bmw-carit.de" target="_blank">moritz.blume@bmw-carit.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Patches "qt4-fail-silent.patch" and "support-oe-qt4-tools-names.patch"<br>
were adapted in order to fit to CMake 3.2.2 (refer to the commit<br>
message in the respective patch for details).<br>
Patch "cmake-2.8.11.2-FindFreetype.patch" was dropped since it was<br>
rejected upstream and its functionality otherwise implemented in the<br>
meantime.<br>
<br>
Note that CMake 3 needs to have the full compiler path in the toolchain<br>
file (see cmake.bbclass).<br>
<br>
Signed-off-by: Moritz Blume <<a href="mailto:moritz.blume@bmw-carit.de">moritz.blume@bmw-carit.de</a>><br>
---<br>
meta/classes/cmake.bbclass | 8 ++-<br>
.../cmake/<a href="http://cmake-native_2.8.12.2.bb" target="_blank">cmake-native_2.8.12.2.bb</a> | 19 ------<br>
meta/recipes-devtools/cmake/<a href="http://cmake-native_3.2.2.bb" target="_blank">cmake-native_3.2.2.bb</a> | 19 ++++++<br>
meta/recipes-devtools/cmake/cmake.inc | 12 ++--<br>
.../cmake/cmake/cmake-2.8.11.2-FindFreetype.patch | 47 ---------------<br>
.../cmake/cmake/qt4-fail-silent.patch | 30 ++++++++--<br>
.../cmake/cmake/support-oe-qt4-tools-names.patch | 70 ++++++++++------------<br>
meta/recipes-devtools/cmake/<a href="http://cmake_2.8.12.2.bb" target="_blank">cmake_2.8.12.2.bb</a> | 52 ----------------<br>
meta/recipes-devtools/cmake/<a href="http://cmake_3.2.2.bb" target="_blank">cmake_3.2.2.bb</a> | 56 +++++++++++++++++<br>
9 files changed, 144 insertions(+), 169 deletions(-)<br>
delete mode 100644 meta/recipes-devtools/cmake/<a href="http://cmake-native_2.8.12.2.bb" target="_blank">cmake-native_2.8.12.2.bb</a><br>
create mode 100644 meta/recipes-devtools/cmake/<a href="http://cmake-native_3.2.2.bb" target="_blank">cmake-native_3.2.2.bb</a><br>
delete mode 100644 meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch<br>
delete mode 100644 meta/recipes-devtools/cmake/<a href="http://cmake_2.8.12.2.bb" target="_blank">cmake_2.8.12.2.bb</a><br>
create mode 100644 meta/recipes-devtools/cmake/<a href="http://cmake_3.2.2.bb" target="_blank">cmake_3.2.2.bb</a><br>
<br>
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass<br>
index 1ebb936..c97fd02 100644<br>
--- a/meta/classes/cmake.bbclass<br>
+++ b/meta/classes/cmake.bbclass<br>
@@ -10,9 +10,11 @@ CCACHE = ""<br>
# We want the staging and installing functions from autotools<br>
inherit autotools<br>
<br>
-# C/C++ Compiler (without cpu arch/tune arguments)<br>
-OECMAKE_C_COMPILER ?= "`echo ${CC} | sed 's/^\([^ ]*\).*/\1/'`"<br>
-OECMAKE_CXX_COMPILER ?= "`echo ${CXX} | sed 's/^\([^ ]*\).*/\1/'`"<br>
+# Full path to C/C++ Compiler (without cpu arch/tune arguments)<br>
+C_COMPILER = "$(echo ${CC} | sed 's/^\([^ ]*\).*/\1/')"<br>
+CXX_COMPILER = "$(echo ${CXX} | sed 's/^\([^ ]*\).*/\1/')"<br>
+OECMAKE_C_COMPILER ?= "$(which ${C_COMPILER})"<br>
+OECMAKE_CXX_COMPILER ?= "$(which ${CXX_COMPILER})"<br>
OECMAKE_AR ?= "${AR}"<br>
<br>
# Compiler flags<br>
diff --git a/meta/recipes-devtools/cmake/<a href="http://cmake-native_2.8.12.2.bb" target="_blank">cmake-native_2.8.12.2.bb</a> b/meta/recipes-devtools/cmake/<a href="http://cmake-native_2.8.12.2.bb" target="_blank">cmake-native_2.8.12.2.bb</a><br>
deleted file mode 100644<br>
index e40dfdd..0000000<br>
--- a/meta/recipes-devtools/cmake/<a href="http://cmake-native_2.8.12.2.bb" target="_blank">cmake-native_2.8.12.2.bb</a><br>
+++ /dev/null<br>
@@ -1,19 +0,0 @@<br>
-require cmake.inc<br>
-inherit native<br>
-<br>
-# Using cmake's internal libarchive, so some dependencies are needed<br>
-DEPENDS += "bzip2-native zlib-native"<br>
-<br>
-SRC_URI += "\<br>
- file://cmlibarchive-disable-ext2fs.patch \<br>
-"<br>
-<br>
-SRC_URI[md5sum] = "17c6513483d23590cbce6957ec6d1e66"<br>
-SRC_URI[sha256sum] = "8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e"<br>
-<br>
-# Disable ccmake since we don't depend on ncurses<br>
-CMAKE_EXTRACONF = "\<br>
- -DBUILD_CursesDialog=0 \<br>
- -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \<br>
- -DHAVE_SYS_ACL_H=0 \<br>
-"<br>
diff --git a/meta/recipes-devtools/cmake/<a href="http://cmake-native_3.2.2.bb" target="_blank">cmake-native_3.2.2.bb</a> b/meta/recipes-devtools/cmake/<a href="http://cmake-native_3.2.2.bb" target="_blank">cmake-native_3.2.2.bb</a><br>
new file mode 100644<br>
index 0000000..17e9e2c<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/cmake/<a href="http://cmake-native_3.2.2.bb" target="_blank">cmake-native_3.2.2.bb</a><br>
@@ -0,0 +1,19 @@<br>
+require cmake.inc<br>
+inherit native<br>
+<br>
+# Using cmake's internal libarchive, so some dependencies are needed<br>
+DEPENDS += "bzip2-native zlib-native"<br>
+<br>
+SRC_URI += "\<br>
+ file://cmlibarchive-disable-ext2fs.patch \<br>
+"<br>
+<br>
+SRC_URI[md5sum] = "2da57308071ea98b10253a87d2419281"<br>
+SRC_URI[sha256sum] = "ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78"<br>
+<br>
+# Disable ccmake since we don't depend on ncurses<br>
+CMAKE_EXTRACONF = "\<br>
+ -DBUILD_CursesDialog=0 \<br>
+ -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \<br>
+ -DHAVE_SYS_ACL_H=0 \<br>
+"<br>
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc<br>
index 28b7f2d..d1cb7ab 100644<br>
--- a/meta/recipes-devtools/cmake/cmake.inc<br>
+++ b/meta/recipes-devtools/cmake/cmake.inc<br>
@@ -6,7 +6,7 @@ HOMEPAGE = "<a href="http://www.cmake.org/" target="_blank">http://www.cmake.org/</a>"<br>
BUGTRACKER = "<a href="http://public.kitware.com/Bug/my_view_page.php" target="_blank">http://public.kitware.com/Bug/my_view_page.php</a>"<br>
SECTION = "console/utils"<br>
LICENSE = "BSD"<br>
-LIC_FILES_CHKSUM = "file://Copyright.txt;md5=bb2fa3a08736b842556f6171bb9e8ae1 \<br>
+LIC_FILES_CHKSUM = "file://Copyright.txt;md5=3ba5a6c34481652ce573e5c4e1d707e4 \<br>
file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2"<br>
<br>
CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}"<br>
@@ -14,11 +14,8 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}"<br>
SRC_URI = "<a href="http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz" target="_blank">http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz</a> \<br>
file://support-oe-qt4-tools-names.patch \<br>
file://qt4-fail-silent.patch \<br>
- file://cmake-2.8.11.2-FindFreetype.patch \<br>
"<br>
<br>
-PR = "r1"<br>
-<br>
inherit autotools<br>
<br>
# Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable<br>
@@ -36,11 +33,12 @@ inherit autotools<br>
<br>
do_configure_prepend() {<br>
sed -i 's/^find_package(Qt5Core QUIET)$/#find_package(Qt5Core QUIET)/g' ${S}/Tests/RunCMake/CMakeLists.txt<br>
- sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake<br>
- sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutomoc/CMakeLists.txt<br>
- sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/Qt4And5Automoc/CMakeLists.txt<br>
+ sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/Qt4And5Automoc/CMakeLists.txt<br>
sed -i 's/^ find_package(Qt5Widgets QUIET NO_MODULE)/# find_package(Qt5Widgets QUIET NO_MODULE)/g' ${S}/Tests/CMakeLists.txt<br>
sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt<br>
+ sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutoUicInterface/CMakeLists.txt<br>
+ sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutogen/CMakeLists.txt<br>
+ sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/autorcc_depends/CMakeLists.txt<br>
}<br>
<br>
# Extra flags to pass to cmake invoked by bootstrap<br>
diff --git a/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch b/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch<br>
deleted file mode 100644<br>
index 1b523c0..0000000<br>
--- a/meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch<br>
+++ /dev/null<br>
@@ -1,47 +0,0 @@<br>
-From: Julian Ospald <<a href="mailto:hasufell@gentoo.org">hasufell@gentoo.org</a>><br>
-Date: Sun Dec 8 13:38:06 UTC 2013<br>
-Subject: fix check for freetype-2.5.1<br>
-<br>
-Upstream-Status: Submitted <a href="http://www.cmake.org/Bug/view.php?id=14601" target="_blank">http://www.cmake.org/Bug/view.php?id=14601</a><br>
-<br>
-Signed-off-by: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a>><br>
-<br>
---- old/Modules/FindFreetype.cmake<br>
-+++ new/Modules/FindFreetype.cmake<br>
-@@ -64,6 +64,19 @@<br>
- PATH_SUFFIXES include/freetype2 include<br>
- )<br>
-<br>
-+if(NOT FREETYPE_INCLUDE_DIR_freetype2)<br>
-+ find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h<br>
-+ HINTS<br>
-+ ENV FREETYPE_DIR<br>
-+ PATHS<br>
-+ /usr/X11R6<br>
-+ /usr/local/X11R6<br>
-+ /usr/local/X11<br>
-+ /usr/freeware<br>
-+ PATH_SUFFIXES include/freetype2 include<br>
-+ )<br>
-+endif()<br>
-+<br>
- find_library(FREETYPE_LIBRARY<br>
- NAMES freetype libfreetype freetype219<br>
- HINTS<br>
-@@ -82,8 +95,14 @@<br>
- endif()<br>
- set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")<br>
-<br>
--if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")<br>
-- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str<br>
-+if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")<br>
-+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")<br>
-+elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")<br>
-+ set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")<br>
-+endif()<br>
-+<br>
-+if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)<br>
-+ file(STRINGS "${FREETYPE_H}" freetype_version_str<br>
- REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")<br>
-<br>
- unset(FREETYPE_VERSION_STRING)<br>
diff --git a/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch b/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch<br>
index fd39f3f..80fc277 100644<br>
--- a/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch<br>
+++ b/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch<br>
@@ -13,10 +13,21 @@ Upstream-Status: Pending<br>
<br>
Signed-off-by: Paul Eggleton <<a href="mailto:paul.eggleton@linux.intel.com">paul.eggleton@linux.intel.com</a>><br>
<br>
---- cmake-2.8.11/Modules/FindQt4.cmake 2013-07-04 10:20:42.092848274 +0100<br>
-+++ cmake-2.8.11/Modules/FindQt4.cmake 2013-07-04 10:52:15.693380555 +0100<br>
-@@ -1025,21 +1025,22 @@<br>
- set(_configs)<br>
+The patch was slightly adapted in order to match cmake 3.2.2:<br>
+Another set_property was introduced which had to be included<br>
+within the if(QT_QTCORE_FOUND) statement.<br>
+<br>
+Signed-off-by: Moritz Blume <<a href="mailto:moritz.blume@bmw-carit.de">moritz.blume@bmw-carit.de</a>><br>
+---<br>
+ Modules/FindQt4.cmake | 39 ++++++++++++++++++++-------------------<br>
+ 1 file changed, 20 insertions(+), 19 deletions(-)<br>
+<br>
+diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake<br>
+index 6704769..9048e35 100644<br>
+--- a/Modules/FindQt4.cmake<br>
++++ b/Modules/FindQt4.cmake<br>
+@@ -1000,25 +1000,26 @@ if (QT_QMAKE_EXECUTABLE AND<br>
+ endif()<br>
endmacro()<br>
<br>
-<br>
@@ -28,6 +39,10 @@ Signed-off-by: Paul Eggleton <<a href="mailto:paul.eggleton@linux.intel.com">paul.eggleton@linux.intel.com</a>><br>
- "${QT_MKSPECS_DIR}/default"<br>
- ${QT_INCLUDE_DIR}<br>
- )<br>
+- set_property(TARGET Qt4::QtCore APPEND PROPERTY<br>
+- INTERFACE_COMPILE_DEFINITIONS<br>
+- $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG><br>
+- )<br>
- set_property(TARGET Qt4::QtCore PROPERTY<br>
- INTERFACE_QT_MAJOR_VERSION 4<br>
- )<br>
@@ -43,6 +58,10 @@ Signed-off-by: Paul Eggleton <<a href="mailto:paul.eggleton@linux.intel.com">paul.eggleton@linux.intel.com</a>><br>
+ "${QT_MKSPECS_DIR}/default"<br>
+ ${QT_INCLUDE_DIR}<br>
+ )<br>
++ set_property(TARGET Qt4::QtCore APPEND PROPERTY<br>
++ INTERFACE_COMPILE_DEFINITIONS<br>
++ $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG><br>
++ )<br>
+ set_property(TARGET Qt4::QtCore PROPERTY<br>
+ INTERFACE_QT_MAJOR_VERSION 4<br>
+ )<br>
@@ -53,3 +72,6 @@ Signed-off-by: Paul Eggleton <<a href="mailto:paul.eggleton@linux.intel.com">paul.eggleton@linux.intel.com</a>><br>
<br>
foreach(QT_MODULE ${QT_MODULES})<br>
_QT4_ADJUST_LIB_VARS(${QT_MODULE})<br>
+--<br>
+1.9.1<br>
+<br>
diff --git a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch<br>
index 0e311f7..15cbca8 100644<br>
--- a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch<br>
+++ b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch<br>
@@ -11,11 +11,19 @@ Upstream-Status: Inappropriate [embedded specific]<br>
<br>
Signed-off-by: Otavio Salvador <<a href="mailto:otavio@ossystems.com.br">otavio@ossystems.com.br</a>><br>
<br>
-Index: cmake-2.8.11/Modules/FindQt4.cmake<br>
-===================================================================<br>
---- cmake-2.8.11.orig/Modules/FindQt4.cmake<br>
-+++ cmake-2.8.11/Modules/FindQt4.cmake<br>
-@@ -569,7 +569,7 @@ endfunction()<br>
+The patch was slightly adapted in order to match cmake 3.2.2:<br>
+Instead of find_program, _find_qt4_program is now used.<br>
+<br>
+Signed-off-by: Moritz Blume <<a href="mailto:moritz.blume@bmw-carit.de">moritz.blume@bmw-carit.de</a>><br>
+---<br>
+ Modules/FindQt4.cmake | 10 +++++-----<br>
+ 1 file changed, 5 insertions(+), 5 deletions(-)<br>
+<br>
+diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake<br>
+index 11091b5..6704769 100644<br>
+--- a/Modules/FindQt4.cmake<br>
++++ b/Modules/FindQt4.cmake<br>
+@@ -522,7 +522,7 @@ endfunction()<br>
<br>
set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)<br>
<br>
@@ -23,36 +31,24 @@ Index: cmake-2.8.11/Modules/FindQt4.cmake<br>
+set(_QT4_QMAKE_NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac)<br>
_qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)<br>
<br>
- if (QT_QMAKE_EXECUTABLE AND QTVERSION)<br>
-@@ -1157,19 +1157,19 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)<br>
- )<br>
-<br>
- find_program(QT_RCC_EXECUTABLE<br>
-- NAMES rcc<br>
-+ NAMES rcc4 rcc<br>
- PATHS ${QT_BINARY_DIR}<br>
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH<br>
- )<br>
+ if (QT_QMAKE_EXECUTABLE AND<br>
+@@ -1148,12 +1148,12 @@ if (QT_QMAKE_EXECUTABLE AND<br>
+ _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc4 moc)<br>
+ _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic4 uic)<br>
+ _find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3)<br>
+- _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc)<br>
+- _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml)<br>
+- _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp)<br>
++ _find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc4 rcc)<br>
++ _find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml4 qdbuscpp2xml)<br>
++ _find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp4 qdbusxml2cpp)<br>
+ _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate-qt4 lupdate4 lupdate)<br>
+ _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease-qt4 lrelease4 lrelease)<br>
+- _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator)<br>
++ _find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator qcollectiongenerator4)<br>
+ _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer4 designer)<br>
+ _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist4 linguist)<br>
<br>
- find_program(QT_DBUSCPP2XML_EXECUTABLE<br>
-- NAMES qdbuscpp2xml<br>
-+ NAMES qdbuscpp2xml4 qdbuscpp2xml<br>
- PATHS ${QT_BINARY_DIR}<br>
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH<br>
- )<br>
-<br>
- find_program(QT_DBUSXML2CPP_EXECUTABLE<br>
-- NAMES qdbusxml2cpp<br>
-+ NAMES qdbusxml2cp4 qdbusxml2cpp<br>
- PATHS ${QT_BINARY_DIR}<br>
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH<br>
- )<br>
-@@ -1187,7 +1187,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)<br>
- )<br>
-<br>
- find_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE<br>
-- NAMES qcollectiongenerator-qt4 qcollectiongenerator<br>
-+ NAMES qcollectiongenerator-qt4 qcollectiongenerator qcollectiongenerator4<br>
- PATHS ${QT_BINARY_DIR}<br>
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH<br>
- )<br>
+--<br>
+1.9.1<br>
+<br>
diff --git a/meta/recipes-devtools/cmake/<a href="http://cmake_2.8.12.2.bb" target="_blank">cmake_2.8.12.2.bb</a> b/meta/recipes-devtools/cmake/<a href="http://cmake_2.8.12.2.bb" target="_blank">cmake_2.8.12.2.bb</a><br>
deleted file mode 100644<br>
index 66a6af6..0000000<br>
--- a/meta/recipes-devtools/cmake/<a href="http://cmake_2.8.12.2.bb" target="_blank">cmake_2.8.12.2.bb</a><br>
+++ /dev/null<br>
@@ -1,52 +0,0 @@<br>
-require cmake.inc<br>
-<br>
-inherit cmake<br>
-<br>
-DEPENDS += "curl expat zlib libarchive"<br>
-<br>
-SRC_URI += "file://dont-run-cross-binaries.patch"<br>
-<br>
-SRC_URI_append_class-nativesdk = " \<br>
- file://OEToolchainConfig.cmake \<br>
- file://<a href="http://environment.d-cmake.sh" target="_blank">environment.d-cmake.sh</a>"<br>
-<br>
-SRC_URI[md5sum] = "17c6513483d23590cbce6957ec6d1e66"<br>
-SRC_URI[sha256sum] = "8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e"<br>
-<br>
-# Strip ${prefix} from ${docdir}, set result into docdir_stripped<br>
-python () {<br>
- prefix=d.getVar("prefix", True)<br>
- docdir=d.getVar("docdir", True)<br>
-<br>
- if not docdir.startswith(prefix):<br>
- raise bb.build.FuncFailed('docdir must contain prefix as its prefix')<br>
-<br>
- docdir_stripped = docdir[len(prefix):]<br>
- if len(docdir_stripped) > 0 and docdir_stripped[0] == '/':<br>
- docdir_stripped = docdir_stripped[1:]<br>
-<br>
- d.setVar("docdir_stripped", docdir_stripped)<br>
-}<br>
-<br>
-EXTRA_OECMAKE=" \<br>
- -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \<br>
- -DCMAKE_USE_SYSTEM_LIBRARIES=1 \<br>
- -DKWSYS_CHAR_IS_SIGNED=1 \<br>
- -DBUILD_CursesDialog=0 \<br>
- ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \<br>
-"<br>
-<br>
-do_install_append_class-nativesdk() {<br>
- mkdir -p ${D}${datadir}/cmake<br>
- install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/<br>
-<br>
- mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d<br>
- install -m 644 ${WORKDIR}/<a href="http://environment.d-cmake.sh" target="_blank">environment.d-cmake.sh</a> ${D}${SDKPATHNATIVE}/environment-setup.d/cmake.sh<br>
-}<br>
-<br>
-FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}"<br>
-<br>
-FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}"<br>
-FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}"<br>
-<br>
-BBCLASSEXTEND = "nativesdk"<br>
diff --git a/meta/recipes-devtools/cmake/<a href="http://cmake_3.2.2.bb" target="_blank">cmake_3.2.2.bb</a> b/meta/recipes-devtools/cmake/<a href="http://cmake_3.2.2.bb" target="_blank">cmake_3.2.2.bb</a><br>
new file mode 100644<br>
index 0000000..4765f6c<br>
--- /dev/null<br>
+++ b/meta/recipes-devtools/cmake/<a href="http://cmake_3.2.2.bb" target="_blank">cmake_3.2.2.bb</a><br>
@@ -0,0 +1,56 @@<br>
+require cmake.inc<br>
+<br>
+inherit cmake<br>
+<br>
+DEPENDS += "curl expat zlib libarchive xz ncurses bzip2"<br>
+<br>
+SRC_URI_append_class-nativesdk = " \<br>
+ file://OEToolchainConfig.cmake \<br>
+ file://<a href="http://environment.d-cmake.sh" target="_blank">environment.d-cmake.sh</a>"<br>
+<br>
+SRC_URI[md5sum] = "2da57308071ea98b10253a87d2419281"<br>
+SRC_URI[sha256sum] = "ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78"<br>
+<br>
+# Strip ${prefix} from ${docdir}, set result into docdir_stripped<br>
+python () {<br>
+ prefix=d.getVar("prefix", True)<br>
+ docdir=d.getVar("docdir", True)<br>
+<br>
+ if not docdir.startswith(prefix):<br>
+ raise bb.build.FuncFailed('docdir must contain prefix as its prefix')<br>
+<br>
+ docdir_stripped = docdir[len(prefix):]<br>
+ if len(docdir_stripped) > 0 and docdir_stripped[0] == '/':<br>
+ docdir_stripped = docdir_stripped[1:]<br>
+<br>
+ d.setVar("docdir_stripped", docdir_stripped)<br>
+}<br>
+<br>
+EXTRA_OECMAKE=" \<br>
+ -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \<br>
+ -DCMAKE_USE_SYSTEM_LIBRARY_BZIP2=1 \<br>
+ -DCMAKE_USE_SYSTEM_LIBRARY_CURL=1 \<br>
+ -DCMAKE_USE_SYSTEM_LIBRARY_EXPAT=1 \<br>
+ -DCMAKE_USE_SYSTEM_LIBRARY_FORM=1 \<br>
+ -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=1 \<br>
+ -DCMAKE_USE_SYSTEM_LIBRARY_LIBLZMA=1 \<br>
+ -DCMAKE_USE_SYSTEM_LIBRARY_ZLIB=1 \<br>
+ -DKWSYS_CHAR_IS_SIGNED=1 \<br>
+ -DBUILD_CursesDialog=0 \<br>
+ ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \<br>
+"<br>
+<br>
+do_install_append_class-nativesdk() {<br>
+ mkdir -p ${D}${datadir}/cmake<br>
+ install -m 644 ${WORKDIR}/OEToolchainConfig.cmake ${D}${datadir}/cmake/<br>
+<br>
+ mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d<br>
+ install -m 644 ${WORKDIR}/<a href="http://environment.d-cmake.sh" target="_blank">environment.d-cmake.sh</a> ${D}${SDKPATHNATIVE}/environment-setup.d/cmake.sh<br>
+}<br>
+<br>
+FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}"<br>
+<br>
+FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}"<br>
+FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}"<br>
+<br>
+BBCLASSEXTEND = "nativesdk"<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.9.1<br>
<br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</font></span></blockquote></div><br></div>