vtk6: consolidate patches

This commit is contained in:
Boris Nagaev 2015-12-20 02:27:47 +03:00
parent b5dcff579d
commit e5273585a1
3 changed files with 86 additions and 65 deletions

86
src/vtk6-1-fixes.patch Normal file
View File

@ -0,0 +1,86 @@
This file is part of MXE.
See index.html for further information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= <muellni@netlair.de>
Date: Sat, 22 Jun 2013 18:44:18 +1000
Subject: [PATCH] add TryRunResults.cmake
diff --git a/TryRunResults.cmake b/TryRunResults.cmake
new file mode 100644
index 1111111..2222222
--- /dev/null
+++ b/TryRunResults.cmake
@@ -0,0 +1,30 @@
+SET( VTK_TYPE_CHAR_IS_SIGNED
+ "1"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+SET( VTK_ANSI_STREAM_EOF_RESULT
+ "1"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+SET( KWSYS_CHAR_IS_SIGNED
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( KWSYS_CHAR_IS_SIGNED__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+
+SET( CMAKE_REQUIRE_LARGE_FILE_SUPPORT
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( CMAKE_REQUIRE_LARGE_FILE_SUPPORT__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+
+SET( KWSYS_LFS_WORKS
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( KWSYS_LFS_WORKS__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= <muellni@netlair.de>
Date: Thu, 29 Aug 2013 10:19:49 +0200
Subject: [PATCH] strip down native configure to required compile tools
diff --git a/Utilities/EncodeString/module.cmake b/Utilities/EncodeString/module.cmake
index 1111111..2222222 100644
--- a/Utilities/EncodeString/module.cmake
+++ b/Utilities/EncodeString/module.cmake
@@ -1,4 +1,7 @@
vtk_module(vtkUtilitiesEncodeString
+ GROUPS
+ CompileTools
DEPENDS
vtksys
+ vtkCommonCore
EXCLUDE_FROM_WRAPPING)
diff --git a/Utilities/HashSource/module.cmake b/Utilities/HashSource/module.cmake
index 1111111..2222222 100644
--- a/Utilities/HashSource/module.cmake
+++ b/Utilities/HashSource/module.cmake
@@ -1,4 +1,6 @@
vtk_module(vtkUtilitiesHashSource
+ GROUPS
+ CompileTools
DEPENDS
vtksys
EXCLUDE_FROM_WRAPPING
diff --git a/Utilities/ParseOGLExt/module.cmake b/Utilities/ParseOGLExt/module.cmake
index 1111111..2222222 100644
--- a/Utilities/ParseOGLExt/module.cmake
+++ b/Utilities/ParseOGLExt/module.cmake
@@ -1,2 +1,4 @@
vtk_module(vtkParseOGLExt
+ GROUPS
+ CompileTools
EXCLUDE_FROM_WRAPPING)

View File

@ -1,36 +0,0 @@
This file is part of MXE.
See index.html for further information.
--- blubb 1970-01-01 01:00:00.000000000 +0100
+++ VTK/TryRunResults.cmake 2011-09-27 08:44:04.563613261 +0200
@@ -0,0 +1,30 @@
+SET( VTK_TYPE_CHAR_IS_SIGNED
+ "1"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+SET( VTK_ANSI_STREAM_EOF_RESULT
+ "1"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+SET( KWSYS_CHAR_IS_SIGNED
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( KWSYS_CHAR_IS_SIGNED__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+
+SET( CMAKE_REQUIRE_LARGE_FILE_SUPPORT
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( CMAKE_REQUIRE_LARGE_FILE_SUPPORT__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+
+SET( KWSYS_LFS_WORKS
+ "0"
+ CACHE STRING "Result from TRY_RUN" FORCE)
+
+SET( KWSYS_LFS_WORKS__TRYRUN_OUTPUT
+ ""
+ CACHE STRING "Output from TRY_RUN" FORCE)
+

View File

@ -1,29 +0,0 @@
This file is part of MXE.
See index.html for further information.
--- VTK6.3.0/Utilities/EncodeString/module.cmake 2013-06-12 21:47:10.000000000 +0200
+++ VTK6.3.0/Utilities/EncodeString/module.cmake 2013-08-29 10:06:51.327921851 +0200
@@ -1,4 +1,7 @@
vtk_module(vtkUtilitiesEncodeString
+ GROUPS
+ CompileTools
DEPENDS
vtksys
+ vtkCommonCore
EXCLUDE_FROM_WRAPPING)
--- VTK6.3.0/Utilities/HashSource/module.cmake 2013-06-12 21:47:10.000000000 +0200
+++ VTK6.3.0/Utilities/HashSource/module.cmake 2013-08-29 09:58:48.055272752 +0200
@@ -1,4 +1,6 @@
vtk_module(vtkUtilitiesHashSource
+ GROUPS
+ CompileTools
DEPENDS
vtksys
EXCLUDE_FROM_WRAPPING
--- VTK6.3.0/Utilities/ParseOGLExt/module.cmake 2013-06-12 21:47:10.000000000 +0200
+++ VTK6.3.0/Utilities/ParseOGLExt/module.cmake 2013-08-29 09:58:54.939480759 +0200
@@ -1,4 +1,6 @@
vtk_module(vtkParseOGLExt
+ GROUPS
+ CompileTools
EXCLUDE_FROM_WRAPPING)