diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2017-10-18 09:17:07 -0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 22:33:23 +0000 |
commit | 55fffefa89f1d81d34170723e8b7f6d2c5246e6b (patch) | |
tree | 7d534ba2ace41e5d7bba55a327a3be514e359185 | |
parent | 526d3e24b26a4914dee837a85b0897505e0ae7db (diff) | |
download | poky-55fffefa89f1d81d34170723e8b7f6d2c5246e6b.tar.gz |
cmake: Upgrade to 3.9.3 release
This upgrades CMake from 3.8.2 to 3.9.3 release. The Copyright.txt
file checksum change was due the addition of a new contributor on the
contributors list.
(From OE-Core rev: 053ad4bbcb72a1783c7928c2f86285c15472314f)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/cmake/cmake-native_3.9.3.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.8.2.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 12 | ||||
-rw-r--r-- | meta/recipes-devtools/cmake/cmake_3.9.3.bb (renamed from meta/recipes-devtools/cmake/cmake_3.8.2.bb) | 0 |
3 files changed, 8 insertions, 4 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.8.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.9.3.bb index e55e8b1cf6..e55e8b1cf6 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.8.2.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.9.3.bb | |||
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 6aeb25fdd5..092ac74610 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc | |||
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.cmake.org/" | |||
6 | BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" | 6 | BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" |
7 | SECTION = "console/utils" | 7 | SECTION = "console/utils" |
8 | LICENSE = "BSD" | 8 | LICENSE = "BSD" |
9 | LIC_FILES_CHKSUM = "file://Copyright.txt;md5=8d8c7bc32f8797d23f5cf605d9339d2d \ | 9 | LIC_FILES_CHKSUM = "file://Copyright.txt;md5=24600643e5d1d2b8f7478ae5c9074949 \ |
10 | file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14" | 10 | file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14" |
11 | 11 | ||
12 | CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" | 12 | CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}" |
@@ -17,8 +17,8 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ | |||
17 | file://0001-FindCUDA-Use-find_program-if-find_host_program-is-no.patch \ | 17 | file://0001-FindCUDA-Use-find_program-if-find_host_program-is-no.patch \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRC_URI[md5sum] = "b5dff61f6a7f1305271ab3f6ae261419" | 20 | SRC_URI[md5sum] = "cb0f19828461904c72ed6a1e55459d03" |
21 | SRC_URI[sha256sum] = "da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d" | 21 | SRC_URI[sha256sum] = "8eaf75e1e932159aae98ab5e7491499545554be62a08cbcbc7c75c84b999f28a" |
22 | 22 | ||
23 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" | 23 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" |
24 | 24 | ||
@@ -42,5 +42,9 @@ do_configure_prepend() { | |||
42 | sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt | 42 | sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt |
43 | sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutoUicInterface/CMakeLists.txt | 43 | sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutoUicInterface/CMakeLists.txt |
44 | sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutogen/CMakeLists.txt | 44 | sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutogen/CMakeLists.txt |
45 | sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/autorcc_depends/CMakeLists.txt | 45 | sed -i 's/^find_package(Qt5Core REQUIRED)/#find_package(Qt5Core REQUIRED)/g' ${S}/Tests/RunCMake/IncompatibleQt/IncompatibleQt.cmake |
46 | sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/mocRerun/CMakeLists.txt | ||
47 | sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/rccDepends/CMakeLists.txt | ||
48 | sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/mocDepends/CMakeLists.txt | ||
49 | sed -i 's/^find_package(Qt5Widgets REQUIRED)/#find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutogen/mocPlugin/CMakeLists.txt | ||
46 | } | 50 | } |
diff --git a/meta/recipes-devtools/cmake/cmake_3.8.2.bb b/meta/recipes-devtools/cmake/cmake_3.9.3.bb index 3f8fd7a997..3f8fd7a997 100644 --- a/meta/recipes-devtools/cmake/cmake_3.8.2.bb +++ b/meta/recipes-devtools/cmake/cmake_3.9.3.bb | |||