cmake: Upgrade 2.8.12.2 -> 3.2.2
v5 cover cmake: Upgrade 2.8.12.2 -> 3.2.2
The changes to the cmake.bbclass file were removed, the absolute compiler path is not necessary.
Moritz Blume (2):
cmake: Whitespace fix
cmake: Upgrade 2.8.12.2 -> 3.2.2
meta/classes/cmake.bbclass | 2 +- .../cmake/cmake-native_2.8.12.2.bb | 19 ------ meta/recipes-devtools/cmake/cmake-native_3.2.2.bb | 19 ++++++ meta/recipes-devtools/cmake/cmake.inc | 12 ++-- .../cmake/cmake/cmake-2.8.11.2-FindFreetype.patch | 47 --------------- .../cmake/cmake/qt4-fail-silent.patch | 30 ++++++++-- .../cmake/cmake/support-oe-qt4-tools-names.patch | 70 ++++++++++------------ meta/recipes-devtools/cmake/cmake_2.8.12.2.bb | 52 ---------------- meta/recipes-devtools/cmake/cmake_3.2.2.bb | 56 +++++++++++++++++ 9 files changed, 140 insertions(+), 167 deletions(-) delete mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.12.2.bb create mode 100644 meta/recipes-devtools/cmake/cmake-native_3.2.2.bb delete mode 100644 meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch delete mode 100644 meta/recipes-devtools/cmake/cmake_2.8.12.2.bb create mode 100644 meta/recipes-devtools/cmake/cmake_3.2.2.bb
Signature · 1 line
1.9.1
PATCH v5 1/2 cmake: Whitespace fix
--- meta/classes/cmake.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/cmake.bbclass +1 -1
@@ -82,7 +82,7 @@ cmake_do_configure() { mkdir -p ${B} cd ${B} else - find ${B} -name CMakeFiles -or -name Makefile -or -name cmake_install.cmake -or -name CMakeCache.txt -delete + find ${B} -name CMakeFiles -or -name Makefile -or -name cmake_install.cmake -or -name CMakeCache.txt -delete fi # Just like autotools cmake can use a site file to cache result that need generated binaries to run
Signature · 1 line
1.9.1
PATCH v5 2/2 cmake: Upgrade 2.8.12.2 -> 3.2.2
In reply to Moritz BlumePatches "qt4-fail-silent.patch" and "support-oe-qt4-tools-names.patch" were adapted in order to fit to CMake 3.2.2 (refer to the commit message in the respective patch for details).
Patch "cmake-2.8.11.2-FindFreetype.patch" was dropped since it was rejected upstream and its functionality otherwise implemented in the meantime.
--- .../cmake/cmake-native_2.8.12.2.bb | 19 ------ meta/recipes-devtools/cmake/cmake-native_3.2.2.bb | 19 ++++++ meta/recipes-devtools/cmake/cmake.inc | 12 ++-- .../cmake/cmake/cmake-2.8.11.2-FindFreetype.patch | 47 --------------- .../cmake/cmake/qt4-fail-silent.patch | 30 ++++++++-- .../cmake/cmake/support-oe-qt4-tools-names.patch | 70 ++++++++++------------ meta/recipes-devtools/cmake/cmake_2.8.12.2.bb | 52 ---------------- meta/recipes-devtools/cmake/cmake_3.2.2.bb | 56 +++++++++++++++++ 8 files changed, 139 insertions(+), 166 deletions(-) delete mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.12.2.bb create mode 100644 meta/recipes-devtools/cmake/cmake-native_3.2.2.bb delete mode 100644 meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch delete mode 100644 meta/recipes-devtools/cmake/cmake_2.8.12.2.bb create mode 100644 meta/recipes-devtools/cmake/cmake_3.2.2.bb
meta/recipes-devtools/cmake/cmake-native_2.8.12.2.bb deleted +0 -19
@@ -1,19 +0,0 @@ -require cmake.inc -inherit native - -# Using cmake's internal libarchive, so some dependencies are needed -DEPENDS += "bzip2-native zlib-native" - -SRC_URI += "\ - file://cmlibarchive-disable-ext2fs.patch \ -" - -SRC_URI[md5sum] = "17c6513483d23590cbce6957ec6d1e66" -SRC_URI[sha256sum] = "8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e" - -# Disable ccmake since we don't depend on ncurses -CMAKE_EXTRACONF = "\ - -DBUILD_CursesDialog=0 \ - -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \ - -DHAVE_SYS_ACL_H=0 \ -"
meta/recipes-devtools/cmake/cmake-native_3.2.2.bb new file +19 -0
@@ -0,0 +1,19 @@ +require cmake.inc +inherit native + +# Using cmake's internal libarchive, so some dependencies are needed +DEPENDS += "bzip2-native zlib-native" + +SRC_URI += "\ + file://cmlibarchive-disable-ext2fs.patch \ +" + +SRC_URI[md5sum] = "2da57308071ea98b10253a87d2419281" +SRC_URI[sha256sum] = "ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78" + +# Disable ccmake since we don't depend on ncurses +CMAKE_EXTRACONF = "\ + -DBUILD_CursesDialog=0 \ + -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \ + -DHAVE_SYS_ACL_H=0 \ +"
meta/recipes-devtools/cmake/cmake.inc +5 -7
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.cmake.org/" BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" SECTION = "console/utils" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://Copyright.txt;md5=bb2fa3a08736b842556f6171bb9e8ae1 \ +LIC_FILES_CHKSUM = "file://Copyright.txt;md5=3ba5a6c34481652ce573e5c4e1d707e4 \ file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2" CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}"
@@ -14,11 +14,8 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}" SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://support-oe-qt4-tools-names.patch \ file://qt4-fail-silent.patch \ - file://cmake-2.8.11.2-FindFreetype.patch \ " -PR = "r1" - inherit autotools # Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable
@@ -36,11 +33,12 @@ inherit autotools do_configure_prepend() { sed -i 's/^find_package(Qt5Core QUIET)$/#find_package(Qt5Core QUIET)/g' ${S}/Tests/RunCMake/CMakeLists.txt - sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake - sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutomoc/CMakeLists.txt - sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/Qt4And5Automoc/CMakeLists.txt + sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/Qt4And5Automoc/CMakeLists.txt sed -i 's/^ find_package(Qt5Widgets QUIET NO_MODULE)/# find_package(Qt5Widgets QUIET NO_MODULE)/g' ${S}/Tests/CMakeLists.txt sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt + sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutoUicInterface/CMakeLists.txt + sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutogen/CMakeLists.txt + sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/autorcc_depends/CMakeLists.txt } # Extra flags to pass to cmake invoked by bootstrap
meta/recipes-devtools/cmake/cmake/cmake-2.8.11.2-FindFreetype.patch deleted +0 -47
47 lines not on this page · raw message
meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch +26 -4
@@ -13,10 +13,21 @@ Upstream-Status: Pending Signed-off-by: Paul Eggleton <[email protected]> ---- cmake-2.8.11/Modules/FindQt4.cmake 2013-07-04 10:20:42.092848274 +0100 -+++ cmake-2.8.11/Modules/FindQt4.cmake 2013-07-04 10:52:15.693380555 +0100 -@@ -1025,21 +1025,22 @@ - set(_configs) +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 <[email protected]> +--- + Modules/FindQt4.cmake | 39 ++++++++++++++++++++------------------- + 1 file changed, 20 insertions(+), 19 deletions(-) + +diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake +index 6704769..9048e35 100644 +--- a/Modules/FindQt4.cmake ++++ b/Modules/FindQt4.cmake +@@ -1000,25 +1000,26 @@ if (QT_QMAKE_EXECUTABLE AND + endif() endmacro() -
@@ -28,6 +39,10 @@ Signed-off-by: Paul Eggleton <[email protected]> - "${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 - )
@@ -43,6 +58,10 @@ Signed-off-by: Paul Eggleton <[email protected]> + "${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 + )
@@ -53,3 +72,6 @@ Signed-off-by: Paul Eggleton <[email protected]> foreach(QT_MODULE ${QT_MODULES}) _QT4_ADJUST_LIB_VARS(${QT_MODULE}) +-- +1.9.1 +
meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch +33 -37
80 lines not on this page · raw message
meta/recipes-devtools/cmake/cmake_2.8.12.2.bb deleted +0 -52
52 lines not on this page · raw message
meta/recipes-devtools/cmake/cmake_3.2.2.bb new file +56 -0
56 lines not on this page · raw message
Signature · 1 line
1.9.1