Mercurial > mxe-octave
changeset 4723:ebd7abf4b0d7
cmake: update to v3.11.3
* src/build-cmake.mk, src/cmake.mk: upate version/checksum
* src/build-cmake-1-fixes.patch: removed
* src/cmake-1-fixes.patch: removed
* dist-files.mk: remove ref'd removed files
| author | John Donoghue |
|---|---|
| date | Fri, 01 Jun 2018 12:42:02 -0400 |
| parents | 2fce10000fa7 |
| children | 3f65a9fa9ad0 |
| files | dist-files.mk src/build-cmake-1-fixes.patch src/build-cmake.mk src/cmake-1-fixes.patch src/cmake.mk |
| diffstat | 5 files changed, 4 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Fri Jun 01 12:02:05 2018 -0400 +++ b/dist-files.mk Fri Jun 01 12:42:02 2018 -0400 @@ -24,7 +24,6 @@ build-automake.mk \ build-binutils.mk \ build-bison.mk \ - build-cmake-1-fixes.patch \ build-cmake.mk \ build-flex-1-fixes.patch \ build-flex.mk \ @@ -59,7 +58,6 @@ cgal-1-fixes.patch \ cgal.mk \ cloog.mk \ - cmake-1-fixes.patch \ cmake.mk \ cminpack.mk \ cppunit.mk \
--- a/src/build-cmake-1-fixes.patch Fri Jun 01 12:02:05 2018 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -diff -ur cmake-3.11.2.orig/Source/CMakeLists.txt cmake-3.11.2/Source/CMakeLists.txt ---- cmake-3.11.2.orig/Source/CMakeLists.txt 2018-05-29 14:54:25.522904245 -0400 -+++ cmake-3.11.2/Source/CMakeLists.txt 2018-05-29 14:57:09.553947612 -0400 -@@ -949,8 +949,8 @@ - endif() - if(WIN32 OR (CYGWIN AND LibUUID_FOUND)) - set(CPACK_SRCS ${CPACK_SRCS} -- CPack/Wix/cmCMakeToWixPath.cxx -- CPack/Wix/cmCMakeToWixPath.h -+ CPack/WiX/cmCMakeToWixPath.cxx -+ CPack/WiX/cmCMakeToWixPath.h - CPack/WiX/cmCPackWIXGenerator.cxx - CPack/WiX/cmCPackWIXGenerator.h - CPack/WiX/cmWIXAccessControlList.cxx
--- a/src/build-cmake.mk Fri Jun 01 12:02:05 2018 -0400 +++ b/src/build-cmake.mk Fri Jun 01 12:42:02 2018 -0400 @@ -3,8 +3,8 @@ PKG := build-cmake $(PKG)_IGNORE := -$(PKG)_VERSION := 3.11.2 -$(PKG)_CHECKSUM := 75ffbe02186b8e04044bd2e29389deeb57a8a71a +$(PKG)_VERSION := 3.11.3 +$(PKG)_CHECKSUM := 73261a5b7f71abf7277c1d2a418ca3c4cf170c89 $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
--- a/src/cmake-1-fixes.patch Fri Jun 01 12:02:05 2018 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -diff -ur cmake-3.11.2.orig/Source/CMakeLists.txt cmake-3.11.2/Source/CMakeLists.txt ---- cmake-3.11.2.orig/Source/CMakeLists.txt 2018-05-29 14:54:25.522904245 -0400 -+++ cmake-3.11.2/Source/CMakeLists.txt 2018-05-29 14:57:09.553947612 -0400 -@@ -949,8 +949,8 @@ - endif() - if(WIN32 OR (CYGWIN AND LibUUID_FOUND)) - set(CPACK_SRCS ${CPACK_SRCS} -- CPack/Wix/cmCMakeToWixPath.cxx -- CPack/Wix/cmCMakeToWixPath.h -+ CPack/WiX/cmCMakeToWixPath.cxx -+ CPack/WiX/cmCMakeToWixPath.h - CPack/WiX/cmCPackWIXGenerator.cxx - CPack/WiX/cmCPackWIXGenerator.h - CPack/WiX/cmWIXAccessControlList.cxx
--- a/src/cmake.mk Fri Jun 01 12:02:05 2018 -0400 +++ b/src/cmake.mk Fri Jun 01 12:42:02 2018 -0400 @@ -3,8 +3,8 @@ PKG := cmake $(PKG)_IGNORE := -$(PKG)_VERSION := 3.11.2 -$(PKG)_CHECKSUM := 75ffbe02186b8e04044bd2e29389deeb57a8a71a +$(PKG)_VERSION := 3.11.3 +$(PKG)_CHECKSUM := 73261a5b7f71abf7277c1d2a418ca3c4cf170c89 $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)