cmake: update to 3.7.0

License is still 3-clause BSD.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-devtools/cmake/cmake-native_3.6.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.7.0.bb
similarity index 95%
rename from meta/recipes-devtools/cmake/cmake-native_3.6.2.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.7.0.bb
index aec0d64de110d8eda50fbb0126cc13e402df0b50..7ad4345efe4599496a04a91f65f402110cbec537 100644 (file)
--- 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 = "\
     -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
     -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
     -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \
+    -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
     -DENABLE_ACL=0 -DHAVE_ACL_LIBACL_H=0 \
     -DHAVE_SYS_ACL_H=0 \
 "

diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index fee511fe4c113c893fab357af198b8b99479db15..9ae28900a60985a0b09b3d05be07353a0586cf87 100644 (file)
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -6,8 +6,8 @@ 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=052f86c15bbde68af55c7f7b340ab639 \
-                    file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2"
+LIC_FILES_CHKSUM = "file://Copyright.txt;md5=7a64bc564202bf7401d9a8ef33c9564d \
+                    file://Source/cmake.h;beginline=1;endline=3;md5=4494dee184212fc89c469c3acd555a14"
 
 CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV', True).split('.')[0:2])}"
 
@@ -17,8 +17,8 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
            file://avoid-gcc-warnings-with-Wstrict-prototypes.patch \
            "
 
-SRC_URI[md5sum] = "139d7affdd4e8ab1edfc9f4322d69e43"
-SRC_URI[sha256sum] = "189ae32a6ac398bb2f523ae77f70d463a6549926cde1544cd9cc7c6609f8b346"
+SRC_URI[md5sum] = "3801dc4e54c1c957a7378d8b0d4254ba"
+SRC_URI[sha256sum] = "ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31"
 
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
 

diff --git a/meta/recipes-devtools/cmake/cmake_3.6.2.bb b/meta/recipes-devtools/cmake/cmake_3.7.0.bb
similarity index 97%
rename from meta/recipes-devtools/cmake/cmake_3.6.2.bb
rename to meta/recipes-devtools/cmake/cmake_3.7.0.bb
index 850d6de231edf5aa3e66f730f6af72e319833d48..58c66156803c4fc8a1fe7e00293e1e1e310dec1d 100644 (file)
--- 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=" \
     -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \
     -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
     -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
+    -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
     -DKWSYS_CHAR_IS_SIGNED=1 \
     -DBUILD_CursesDialog=0 \
     ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \