summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-11-28 15:34:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-30 15:48:08 +0000
commit4480ee53342fa66a1126f083b489c9b1c1725a85 (patch)
tree4048efce9d6e2fddb55b459e5a1c57fa1d5860de
parent9e5a55bf76191d1668336baef1b92de861d05164 (diff)
downloadpoky-4480ee53342fa66a1126f083b489c9b1c1725a85.tar.gz
cmake: update to 3.7.0
License is still 3-clause BSD. (From OE-Core rev: f9abf70ef9e55be4bdbf90836a8ba083210f82ad) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> 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.7.0.bb (renamed from meta/recipes-devtools/cmake/cmake-native_3.6.2.bb)1
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc8
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.7.0.bb (renamed from meta/recipes-devtools/cmake/cmake_3.6.2.bb)1
3 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.6.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.7.0.bb
index aec0d64de1..7ad4345efe 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.6.2.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.7.0.bb
@@ -17,6 +17,7 @@ CMAKE_EXTRACONF = "\
17 -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ 17 -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
18 -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ 18 -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
19 -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \ 19 -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \
20 -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
20 -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \ 21 -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \
21 -DHAVE_SYS_ACL_H=0 \ 22 -DHAVE_SYS_ACL_H=0 \
22" 23"
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index fee511fe4c..9ae28900a6 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -6,8 +6,8 @@ HOMEPAGE = "http://www.cmake.org/"
6BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php" 6BUGTRACKER = "http://public.kitware.com/Bug/my_view_page.php"
7SECTION = "console/utils" 7SECTION = "console/utils"
8LICENSE = "BSD" 8LICENSE = "BSD"
9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=052f86c15bbde68af55c7f7b340ab639 \ 9LIC_FILES_CHKSUM = "file://Copyright.txt;md5=7a64bc564202bf7401d9a8ef33c9564d \
10 file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2" 10 file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14"
11 11
12CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV', True).split('.')[0:2])}" 12CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV', True).split('.')[0:2])}"
13 13
@@ -17,8 +17,8 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
17 file://avoid-gcc-warnings-with-Wstrict-prototypes.patch \ 17 file://avoid-gcc-warnings-with-Wstrict-prototypes.patch \
18 " 18 "
19 19
20SRC_URI[md5sum] = "139d7affdd4e8ab1edfc9f4322d69e43" 20SRC_URI[md5sum] = "3801dc4e54c1c957a7378d8b0d4254ba"
21SRC_URI[sha256sum] = "189ae32a6ac398bb2f523ae77f70d463a6549926cde1544cd9cc7c6609f8b346" 21SRC_URI[sha256sum] = "ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31"
22 22
23UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" 23UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
24 24
diff --git a/meta/recipes-devtools/cmake/cmake_3.6.2.bb b/meta/recipes-devtools/cmake/cmake_3.7.0.bb
index 850d6de231..58c6615680 100644
--- a/meta/recipes-devtools/cmake/cmake_3.6.2.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.7.0.bb
@@ -27,6 +27,7 @@ EXTRA_OECMAKE=" \
27 -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \ 27 -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \
28 -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ 28 -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
29 -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ 29 -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
30 -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
30 -DKWSYS_CHAR_IS_SIGNED=1 \ 31 -DKWSYS_CHAR_IS_SIGNED=1 \
31 -DBUILD_CursesDialog=0 \ 32 -DBUILD_CursesDialog=0 \
32 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \ 33 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \