Mercurial > mxe-octave

changeset 4720:2446c7c4e7e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmake: fix mingw cross compile issue * src/build-cmake-1-fixes.patch: new file * src/cmake-1-fixes.patch: new file * dist-files.mk: add refs to new files
author John Donoghue
date Tue, 29 May 2018 15:37:58 -0400
parents ef046197fb97
children b1254195f2ec
files dist-files.mk src/build-cmake-1-fixes.patch src/cmake-1-fixes.patch
diffstat 3 files changed, 30 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Tue May 29 10:06:01 2018 -0400
+++ b/dist-files.mk	Tue May 29 15:37:58 2018 -0400
@@ -24,6 +24,7 @@
   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 \
@@ -58,6 +59,7 @@
   cgal-1-fixes.patch \
   cgal.mk \
   cloog.mk \
+  cmake-1-fixes.patch \
   cmake.mk \
   cminpack.mk \
   cppunit.mk \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/build-cmake-1-fixes.patch	Tue May 29 15:37:58 2018 -0400
@@ -0,0 +1,14 @@
+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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cmake-1-fixes.patch	Tue May 29 15:37:58 2018 -0400
@@ -0,0 +1,14 @@
+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