mirror of https://git.wownero.com/dsc/mxe.git
vtk: consolidate patches
This commit is contained in:
Boris Nagaev
parent
c26f3225fb
commit
2ffb7835cd
|
|
@ -1,19 +1,301 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
This patch has been taken from the git url below:
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Muellni <mmuellen@gmx.de>
|
||||
Date: Tue, 25 Oct 2011 23:32:42 +0200
|
||||
Subject: [PATCH] add file 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
|
||||
+ ""
|
||||
+ 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: Muellni <mmuellen@gmx.de>
|
||||
Date: Tue, 25 Oct 2011 23:32:42 +0200
|
||||
Subject: [PATCH] PATH_SUFFIXES freetype2
|
||||
|
||||
This patch has been taken from:
|
||||
http://www.vtk.org/Bug/view.php?id=12688
|
||||
|
||||
diff --git a/CMake/FindFREETYPE.cmake b/CMake/FindFREETYPE.cmake
|
||||
index 1111111..2222222 100644
|
||||
--- a/CMake/FindFREETYPE.cmake
|
||||
+++ b/CMake/FindFREETYPE.cmake
|
||||
@@ -15,6 +15,7 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h)
|
||||
FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
|
||||
/usr/include/freetype2
|
||||
/usr/local/include/freetype2
|
||||
+ PATH_SUFFIXES freetype2
|
||||
)
|
||||
|
||||
FIND_LIBRARY(FREETYPE_LIBRARY freetype)
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Muellni <mmuellen@gmx.de>
|
||||
Date: Mon, 31 Oct 2011 09:04:03 +0100
|
||||
Subject: [PATCH] building without wine
|
||||
|
||||
merged compile tools patches into one patch file and added
|
||||
a CompileTools target for compiling only the compile tools
|
||||
during the native build
|
||||
|
||||
This patch has been taken from:
|
||||
http://www.vtk.org/Bug/view.php?id=12686
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1111111..2222222 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -42,6 +42,10 @@ IF(NOT EXPORT_EXECUTABLES_FILE)
|
||||
FILE(WRITE "${EXPORT_EXECUTABLES_FILE}" "#generated by VTK, do not edit\n")
|
||||
ENDIF(NOT EXPORT_EXECUTABLES_FILE)
|
||||
|
||||
+# Add a target for building only the compile tools
|
||||
+ADD_CUSTOM_TARGET(CompileTools)
|
||||
+SET(COMPILE_TOOLS_TARGET "CompileTools")
|
||||
+
|
||||
GET_PROPERTY(VTK_TARGET_SUPPORTS_SHARED_LIBS
|
||||
GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
|
||||
|
||||
diff --git a/Utilities/kwsys/CMakeLists.txt b/Utilities/kwsys/CMakeLists.txt
|
||||
index 1111111..2222222 100644
|
||||
--- a/Utilities/kwsys/CMakeLists.txt
|
||||
+++ b/Utilities/kwsys/CMakeLists.txt
|
||||
@@ -937,13 +937,20 @@ ENDIF(KWSYS_USE_String)
|
||||
# file and build it into the library. Win9x platforms reproduce the
|
||||
# executable into a temporary directory when it is needed.
|
||||
IF(KWSYS_USE_Process)
|
||||
- IF(NOT UNIX)
|
||||
+ IF(NOT CMAKE_CROSSCOMPILING)
|
||||
# Build the forwarding executable itself and a program that will
|
||||
# encode it into a C file.
|
||||
- ADD_EXECUTABLE(${KWSYS_NAMESPACE}ProcessFwd9x ProcessFwd9x.c)
|
||||
ADD_EXECUTABLE(${KWSYS_NAMESPACE}EncodeExecutable EncodeExecutable.c)
|
||||
- KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}ProcessFwd9x PROPERTY LABELS ${KWSYS_LABELS_EXE})
|
||||
KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}EncodeExecutable PROPERTY LABELS ${KWSYS_LABELS_EXE})
|
||||
+ EXPORT(TARGETS ${KWSYS_NAMESPACE}EncodeExecutable FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND)
|
||||
+ IF(COMPILE_TOOLS_TARGET)
|
||||
+ ADD_DEPENDENCIES(${COMPILE_TOOLS_TARGET} ${KWSYS_NAMESPACE}EncodeExecutable)
|
||||
+ ENDIF(COMPILE_TOOLS_TARGET)
|
||||
+ ENDIF(NOT CMAKE_CROSSCOMPILING)
|
||||
+
|
||||
+ IF(NOT UNIX)
|
||||
+ ADD_EXECUTABLE(${KWSYS_NAMESPACE}ProcessFwd9x ProcessFwd9x.c)
|
||||
+ KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}ProcessFwd9x PROPERTY LABELS ${KWSYS_LABELS_EXE})
|
||||
|
||||
# Construct the location of the executable to be encoded.
|
||||
SET(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR})
|
||||
@@ -957,24 +964,23 @@ IF(KWSYS_USE_Process)
|
||||
ENDIF(CMAKE_BUILD_TOOL MATCHES "make")
|
||||
|
||||
# Take advantage of a better custom command syntax if possible.
|
||||
- SET(CMD ${BIN_DIR}${CFG_INTDIR}/${KWSYS_NAMESPACE}EncodeExecutable.exe)
|
||||
SET(FWD ${BIN_DIR}${CFG_INTDIR}/${KWSYS_NAMESPACE}ProcessFwd9x.exe)
|
||||
IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 1.6)
|
||||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KWSYS_NAMESPACE}ProcessFwd9xEnc.c
|
||||
- COMMAND ${CMD}
|
||||
+ COMMAND ${KWSYS_NAMESPACE}EncodeExecutable
|
||||
ARGS ${FWD} ${CMAKE_CURRENT_BINARY_DIR}/${KWSYS_NAMESPACE}ProcessFwd9xEnc.c
|
||||
${KWSYS_NAMESPACE} ProcessFwd9x
|
||||
- DEPENDS ${CMD} ${FWD})
|
||||
+ DEPENDS ${KWSYS_NAMESPACE}EncodeExecutable ${FWD})
|
||||
ELSE("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 1.6)
|
||||
ADD_CUSTOM_COMMAND(
|
||||
TARGET ${KWSYS_NAMESPACE}
|
||||
SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/ProcessFwd9x.c
|
||||
- COMMAND ${CMD}
|
||||
+ COMMAND ${KWSYS_NAMESPACE}EncodeExecutable
|
||||
ARGS ${FWD} ${CMAKE_CURRENT_BINARY_DIR}/${KWSYS_NAMESPACE}ProcessFwd9xEnc.c
|
||||
${KWSYS_NAMESPACE} ProcessFwd9x
|
||||
OUTPUTS ${CMAKE_CURRENT_BINARY_DIR}/${KWSYS_NAMESPACE}ProcessFwd9xEnc.c
|
||||
- DEPENDS ${CMD} ${FWD})
|
||||
+ DEPENDS ${KWSYS_NAMESPACE}EncodeExecutable ${FWD})
|
||||
ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 1.6)
|
||||
|
||||
# Make sure build occurs in proper order.
|
||||
diff --git a/Utilities/vtkhdf5/src/CMakeLists.txt b/Utilities/vtkhdf5/src/CMakeLists.txt
|
||||
index 1111111..2222222 100644
|
||||
--- a/Utilities/vtkhdf5/src/CMakeLists.txt
|
||||
+++ b/Utilities/vtkhdf5/src/CMakeLists.txt
|
||||
@@ -572,34 +572,40 @@ INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR})
|
||||
# Setup the H5Detect utility which generates H5Tinit with platform
|
||||
# specific type checks inside
|
||||
#-----------------------------------------------------------------------------
|
||||
-SET (CMD ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}${CFG_INIT}/H5detect${EXE_EXT})
|
||||
-IF (XCODE)
|
||||
- SET (CMD "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/\${CONFIGURATION}/H5detect")
|
||||
-ENDIF (XCODE)
|
||||
-ADD_EXECUTABLE (H5detect ${HDF5_SRC_DIR}/H5detect.c)
|
||||
-IF (WIN32)
|
||||
- TARGET_LINK_LIBRARIES (H5detect "ws2_32.lib")
|
||||
-ENDIF (WIN32)
|
||||
+IF(NOT CMAKE_CROSSCOMPILING)
|
||||
+ ADD_EXECUTABLE (H5detect ${HDF5_SRC_DIR}/H5detect.c)
|
||||
+ IF (WIN32)
|
||||
+ TARGET_LINK_LIBRARIES (H5detect "ws2_32.lib")
|
||||
+ ENDIF (WIN32)
|
||||
+
|
||||
+ EXPORT(TARGETS H5detect FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND)
|
||||
+ IF(COMPILE_TOOLS_TARGET)
|
||||
+ ADD_DEPENDENCIES(${COMPILE_TOOLS_TARGET} H5detect)
|
||||
+ ENDIF(COMPILE_TOOLS_TARGET)
|
||||
+ENDIF(NOT CMAKE_CROSSCOMPILING)
|
||||
|
||||
ADD_CUSTOM_COMMAND (
|
||||
OUTPUT ${HDF5_BINARY_DIR}/H5Tinit.c
|
||||
- COMMAND ${CMD}
|
||||
+ COMMAND H5detect
|
||||
ARGS > ${HDF5_BINARY_DIR}/H5Tinit.c
|
||||
DEPENDS H5detect
|
||||
)
|
||||
|
||||
-SET (CMDL ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}${CFG_INIT}/H5make_libsettings${EXE_EXT})
|
||||
-IF (XCODE)
|
||||
- SET (CMDL "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/\${CONFIGURATION}/H5make_libsettings")
|
||||
-ENDIF (XCODE)
|
||||
-ADD_EXECUTABLE (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c)
|
||||
-IF (WIN32)
|
||||
- TARGET_LINK_LIBRARIES (H5make_libsettings "ws2_32.lib")
|
||||
-ENDIF (WIN32)
|
||||
+IF(NOT CMAKE_CROSSCOMPILING)
|
||||
+ ADD_EXECUTABLE (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c)
|
||||
+ IF (WIN32)
|
||||
+ TARGET_LINK_LIBRARIES (H5make_libsettings "ws2_32.lib")
|
||||
+ ENDIF (WIN32)
|
||||
+
|
||||
+ EXPORT(TARGETS H5make_libsettings FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND)
|
||||
+ IF(COMPILE_TOOLS_TARGET)
|
||||
+ ADD_DEPENDENCIES(${COMPILE_TOOLS_TARGET} H5make_libsettings)
|
||||
+ ENDIF(COMPILE_TOOLS_TARGET)
|
||||
+ENDIF(NOT CMAKE_CROSSCOMPILING)
|
||||
|
||||
ADD_CUSTOM_COMMAND (
|
||||
OUTPUT ${HDF5_BINARY_DIR}/H5lib_settings.c
|
||||
- COMMAND ${CMDL}
|
||||
+ COMMAND H5make_libsettings
|
||||
ARGS > ${HDF5_BINARY_DIR}/H5lib_settings.c
|
||||
DEPENDS H5make_libsettings
|
||||
)
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Tue, 22 Nov 2011 22:18:31 +1100
|
||||
Subject: [PATCH] disable gui components in native build
|
||||
|
||||
|
||||
diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
|
||||
index 1111111..2222222 100644
|
||||
--- a/Utilities/CMakeLists.txt
|
||||
+++ b/Utilities/CMakeLists.txt
|
||||
@@ -68,10 +68,8 @@ IF(VTK_USE_PARALLEL)
|
||||
VTK_THIRD_PARTY_SUBDIR(Cosmo Cosmo)
|
||||
ENDIF(VTK_USE_PARALLEL)
|
||||
|
||||
-IF(VTK_USE_RENDERING)
|
||||
- ADD_SUBDIRECTORY(ftgl)
|
||||
- ADD_SUBDIRECTORY(ParseOGLExt)
|
||||
-ENDIF(VTK_USE_RENDERING)
|
||||
+ADD_SUBDIRECTORY(ftgl)
|
||||
+ADD_SUBDIRECTORY(ParseOGLExt)
|
||||
|
||||
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
|
||||
INSTALL(FILES
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Wed, 23 Nov 2011 20:31:10 +1100
|
||||
Subject: [PATCH] fix third party module search path
|
||||
|
||||
This patch has been taken from:
|
||||
http://www.vtk.org/Bug/view.php?id=12746
|
||||
|
||||
diff --git a/CMake/vtkThirdParty.cmake b/CMake/vtkThirdParty.cmake
|
||||
index 1111111..2222222 100644
|
||||
--- a/CMake/vtkThirdParty.cmake
|
||||
+++ b/CMake/vtkThirdParty.cmake
|
||||
@@ -3,11 +3,11 @@ MACRO(VTK_THIRD_PARTY_OPTION upper lower)
|
||||
OPTION(VTK_USE_SYSTEM_${upper} "Use the system's ${lower} library." OFF)
|
||||
MARK_AS_ADVANCED(VTK_USE_SYSTEM_${upper})
|
||||
IF(VTK_USE_SYSTEM_${upper})
|
||||
- IF(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake)
|
||||
- INCLUDE(${CMAKE_ROOT}/Modules/Find${upper}.cmake)
|
||||
- ELSE(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake)
|
||||
+ IF(EXISTS ${VTK_CMAKE_DIR}/Find${upper}.cmake)
|
||||
INCLUDE(${VTK_CMAKE_DIR}/Find${upper}.cmake)
|
||||
- ENDIF(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake)
|
||||
+ ELSE(EXISTS ${VTK_CMAKE_DIR}/Find${upper}.cmake)
|
||||
+ INCLUDE(${CMAKE_ROOT}/Modules/Find${upper}.cmake)
|
||||
+ ENDIF(EXISTS ${VTK_CMAKE_DIR}/Find${upper}.cmake)
|
||||
MARK_AS_ADVANCED(${upper}_INCLUDE_DIR ${upper}_LIBRARY)
|
||||
IF(${upper}_FOUND)
|
||||
SET(VTK_${upper}_LIBRARIES ${${upper}_LIBRARIES})
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Mon, 28 Nov 2011 00:24:59 +1100
|
||||
Subject: [PATCH] portability fix for Debian kFreeBSD
|
||||
|
||||
|
||||
diff --git a/Utilities/vtkhdf5/src/H5private.h b/Utilities/vtkhdf5/src/H5private.h
|
||||
index 1111111..2222222 100644
|
||||
--- a/Utilities/vtkhdf5/src/H5private.h
|
||||
+++ b/Utilities/vtkhdf5/src/H5private.h
|
||||
@@ -141,7 +141,7 @@
|
||||
# include <sys/sysinfo.h>
|
||||
#endif
|
||||
/* Prevent compile errors with GCC 4.3 on Solaris 2.10 */
|
||||
-#if defined (__SVR4) && defined (__sun)
|
||||
+#if defined (__SVR4) && defined (__sun) || defined(__FreeBSD_kernel__) && defined(__GLIBC__)
|
||||
/* In file included from /usr/include/sys/klwp.h:19,
|
||||
* from /usr/include/sys/thread.h:13,
|
||||
* from /usr/include/sys/proc.h:20,
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: David Partyka <david.partyka@kitware.com>
|
||||
Date: Wed, 21 Sep 2011 13:19:30 +0000 (-0400)
|
||||
Subject: Merge branch '11742_mingw64_compile_fixes' into release
|
||||
X-Git-Tag: v5.10.0-rc1~108^2~1
|
||||
X-Git-Url: http://vtk.org/gitweb?p=VTK.git;a=commitdiff_plain;h=be64234e8399145f1e2c099500779a9bcff75702;hp=7b4ad680f6b2b4b4211baf47de6588308db7e14f
|
||||
Date: Wed, 21 Sep 2011 13:19:30 -0400
|
||||
Subject: [PATCH] Merge branch '11742_mingw64_compile_fixes' into release
|
||||
|
||||
Merge branch '11742_mingw64_compile_fixes' into release
|
||||
---
|
||||
|
||||
diff --git a/Common/vtkWin32Header.h b/Common/vtkWin32Header.h
|
||||
index 81b094a..a3edb90 100644
|
||||
index 1111111..2222222 100644
|
||||
--- a/Common/vtkWin32Header.h
|
||||
+++ b/Common/vtkWin32Header.h
|
||||
@@ -102,9 +102,15 @@ Do_not_include_vtkWin32Header_directly__vtkSystemIncludes_includes_it;
|
||||
|
|
@ -33,7 +315,7 @@ index 81b094a..a3edb90 100644
|
|||
|
||||
#endif
|
||||
diff --git a/Hybrid/vtkVideoSource.cxx b/Hybrid/vtkVideoSource.cxx
|
||||
index 1fcdbe1..c40b845 100644
|
||||
index 1111111..2222222 100644
|
||||
--- a/Hybrid/vtkVideoSource.cxx
|
||||
+++ b/Hybrid/vtkVideoSource.cxx
|
||||
@@ -32,9 +32,9 @@
|
||||
|
|
@ -522,7 +804,7 @@ index 1fcdbe1..c40b845 100644
|
|||
this->UnpackRasterLine(outPtrTmp,inPtrTmp,inPadX,outX);
|
||||
}
|
||||
diff --git a/Rendering/vtkFreeTypeTools.cxx b/Rendering/vtkFreeTypeTools.cxx
|
||||
index 7443693..681fae6 100644
|
||||
index 1111111..2222222 100644
|
||||
--- a/Rendering/vtkFreeTypeTools.cxx
|
||||
+++ b/Rendering/vtkFreeTypeTools.cxx
|
||||
@@ -222,7 +222,7 @@ vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id,
|
||||
|
|
@ -535,7 +817,7 @@ index 7443693..681fae6 100644
|
|||
// Fonts, organized by [Family][Bold][Italic]
|
||||
static EmbeddedFontStruct EmbeddedFonts[3][2][2] =
|
||||
diff --git a/Rendering/vtkFreeTypeUtilities.cxx b/Rendering/vtkFreeTypeUtilities.cxx
|
||||
index 629e5da..2d140a8 100644
|
||||
index 1111111..2222222 100644
|
||||
--- a/Rendering/vtkFreeTypeUtilities.cxx
|
||||
+++ b/Rendering/vtkFreeTypeUtilities.cxx
|
||||
@@ -337,7 +337,7 @@ vtkFreeTypeUtilitiesFaceRequester(FTC_FaceID face_id,
|
||||
|
|
@ -548,7 +830,7 @@ index 629e5da..2d140a8 100644
|
|||
// Fonts, organized by [Family][Bold][Italic]
|
||||
|
||||
diff --git a/Rendering/vtkWin32OpenGLRenderWindow.cxx b/Rendering/vtkWin32OpenGLRenderWindow.cxx
|
||||
index a4485d2..6b6e6b4 100644
|
||||
index 1111111..2222222 100644
|
||||
--- a/Rendering/vtkWin32OpenGLRenderWindow.cxx
|
||||
+++ b/Rendering/vtkWin32OpenGLRenderWindow.cxx
|
||||
@@ -75,9 +75,9 @@ vtkWin32OpenGLRenderWindow::~vtkWin32OpenGLRenderWindow()
|
||||
|
|
@ -1346,7 +1628,7 @@ index a4485d2..6b6e6b4 100644
|
|||
SetCursor((HCURSOR)cursor);
|
||||
}
|
||||
diff --git a/Rendering/vtkWin32RenderWindowInteractor.cxx b/Rendering/vtkWin32RenderWindowInteractor.cxx
|
||||
index a53bbc8..8a3dc63 100644
|
||||
index 1111111..2222222 100644
|
||||
--- a/Rendering/vtkWin32RenderWindowInteractor.cxx
|
||||
+++ b/Rendering/vtkWin32RenderWindowInteractor.cxx
|
||||
@@ -17,10 +17,12 @@
|
||||
|
|
@ -2110,3 +2392,34 @@ index a53bbc8..8a3dc63 100644
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Sun, 23 Jun 2013 04:50:32 +1000
|
||||
Subject: [PATCH] enable mingw-w64 build
|
||||
|
||||
This patch has been taken from:
|
||||
http://vtk.org/Bug/print_bug_page.php?bug_id=11742
|
||||
|
||||
diff --git a/Hybrid/vtkWin32VideoSource.cxx b/Hybrid/vtkWin32VideoSource.cxx
|
||||
index 1111111..2222222 100644
|
||||
--- a/Hybrid/vtkWin32VideoSource.cxx
|
||||
+++ b/Hybrid/vtkWin32VideoSource.cxx
|
||||
@@ -274,7 +274,7 @@ void vtkWin32VideoSource::Initialize()
|
||||
}
|
||||
|
||||
// set the user data to 'this'
|
||||
- vtkSetWindowLong(this->Internal->ParentWnd,vtkGWL_USERDATA,(vtkLONG)this);
|
||||
+ vtkSetWindowLong(this->Internal->ParentWnd,vtkGWL_USERDATA,(intptr_t)this);
|
||||
|
||||
// Create the capture window
|
||||
this->Internal->CapWnd = capCreateCaptureWindow("Capture",
|
||||
@@ -339,7 +339,7 @@ void vtkWin32VideoSource::Initialize()
|
||||
}
|
||||
|
||||
// set user data for callbacks
|
||||
- if (!capSetUserData(this->Internal->CapWnd,(long)this))
|
||||
+ if (!capSetUserData(this->Internal->CapWnd,(intptr_t)this))
|
||||
{
|
||||
vtkErrorMacro(<< "Initialize: couldn't set user data for callback"\
|
||||
<< " (" << GetLastError() << ")");
|
||||
|
|
@ -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
|
||||
+ ""
|
||||
+ 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)
|
||||
+
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
This patch has been taken from:
|
||||
http://www.vtk.org/Bug/view.php?id=12688
|
||||
|
||||
--- VTK/CMake/FindFREETYPE.cmake.orig 2011-08-24 15:37:07.000000000 +0200
|
||||
+++ VTK/CMake/FindFREETYPE.cmake 2011-10-25 22:55:52.265702464 +0200
|
||||
@@ -15,6 +15,7 @@
|
||||
FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
|
||||
/usr/include/freetype2
|
||||
/usr/local/include/freetype2
|
||||
+ PATH_SUFFIXES freetype2
|
||||
)
|
||||
|
||||
FIND_LIBRARY(FREETYPE_LIBRARY freetype)
|
||||
|
|
@ -1,140 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
This patch has been taken from:
|
||||
http://www.vtk.org/Bug/view.php?id=12686
|
||||
|
||||
--- VTK/Utilities/kwsys/CMakeLists.txt 2011-08-24 15:37:12.000000000 +0200
|
||||
+++ VTK/Utilities/kwsys/CMakeLists.txt 2011-10-30 00:06:06.402085234 +0200
|
||||
@@ -937,13 +937,20 @@
|
||||
# file and build it into the library. Win9x platforms reproduce the
|
||||
# executable into a temporary directory when it is needed.
|
||||
IF(KWSYS_USE_Process)
|
||||
- IF(NOT UNIX)
|
||||
+ IF(NOT CMAKE_CROSSCOMPILING)
|
||||
# Build the forwarding executable itself and a program that will
|
||||
# encode it into a C file.
|
||||
- ADD_EXECUTABLE(${KWSYS_NAMESPACE}ProcessFwd9x ProcessFwd9x.c)
|
||||
ADD_EXECUTABLE(${KWSYS_NAMESPACE}EncodeExecutable EncodeExecutable.c)
|
||||
- KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}ProcessFwd9x PROPERTY LABELS ${KWSYS_LABELS_EXE})
|
||||
KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}EncodeExecutable PROPERTY LABELS ${KWSYS_LABELS_EXE})
|
||||
+ EXPORT(TARGETS ${KWSYS_NAMESPACE}EncodeExecutable FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND)
|
||||
+ IF(COMPILE_TOOLS_TARGET)
|
||||
+ ADD_DEPENDENCIES(${COMPILE_TOOLS_TARGET} ${KWSYS_NAMESPACE}EncodeExecutable)
|
||||
+ ENDIF(COMPILE_TOOLS_TARGET)
|
||||
+ ENDIF(NOT CMAKE_CROSSCOMPILING)
|
||||
+
|
||||
+ IF(NOT UNIX)
|
||||
+ ADD_EXECUTABLE(${KWSYS_NAMESPACE}ProcessFwd9x ProcessFwd9x.c)
|
||||
+ KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}ProcessFwd9x PROPERTY LABELS ${KWSYS_LABELS_EXE})
|
||||
|
||||
# Construct the location of the executable to be encoded.
|
||||
SET(BIN_DIR ${CMAKE_CURRENT_BINARY_DIR})
|
||||
@@ -957,24 +964,23 @@
|
||||
ENDIF(CMAKE_BUILD_TOOL MATCHES "make")
|
||||
|
||||
# Take advantage of a better custom command syntax if possible.
|
||||
- SET(CMD ${BIN_DIR}${CFG_INTDIR}/${KWSYS_NAMESPACE}EncodeExecutable.exe)
|
||||
SET(FWD ${BIN_DIR}${CFG_INTDIR}/${KWSYS_NAMESPACE}ProcessFwd9x.exe)
|
||||
IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 1.6)
|
||||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KWSYS_NAMESPACE}ProcessFwd9xEnc.c
|
||||
- COMMAND ${CMD}
|
||||
+ COMMAND ${KWSYS_NAMESPACE}EncodeExecutable
|
||||
ARGS ${FWD} ${CMAKE_CURRENT_BINARY_DIR}/${KWSYS_NAMESPACE}ProcessFwd9xEnc.c
|
||||
${KWSYS_NAMESPACE} ProcessFwd9x
|
||||
- DEPENDS ${CMD} ${FWD})
|
||||
+ DEPENDS ${KWSYS_NAMESPACE}EncodeExecutable ${FWD})
|
||||
ELSE("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 1.6)
|
||||
ADD_CUSTOM_COMMAND(
|
||||
TARGET ${KWSYS_NAMESPACE}
|
||||
SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/ProcessFwd9x.c
|
||||
- COMMAND ${CMD}
|
||||
+ COMMAND ${KWSYS_NAMESPACE}EncodeExecutable
|
||||
ARGS ${FWD} ${CMAKE_CURRENT_BINARY_DIR}/${KWSYS_NAMESPACE}ProcessFwd9xEnc.c
|
||||
${KWSYS_NAMESPACE} ProcessFwd9x
|
||||
OUTPUTS ${CMAKE_CURRENT_BINARY_DIR}/${KWSYS_NAMESPACE}ProcessFwd9xEnc.c
|
||||
- DEPENDS ${CMD} ${FWD})
|
||||
+ DEPENDS ${KWSYS_NAMESPACE}EncodeExecutable ${FWD})
|
||||
ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 1.6)
|
||||
|
||||
# Make sure build occurs in proper order.
|
||||
|
||||
--- VTK/Utilities/vtkhdf5/src/CMakeLists.txt 2011-08-24 15:37:13.000000000 +0200
|
||||
+++ VTK/Utilities/vtkhdf5/src/CMakeLists.txt 2011-10-30 00:13:16.798098058 +0200
|
||||
@@ -572,34 +572,40 @@
|
||||
# Setup the H5Detect utility which generates H5Tinit with platform
|
||||
# specific type checks inside
|
||||
#-----------------------------------------------------------------------------
|
||||
-SET (CMD ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}${CFG_INIT}/H5detect${EXE_EXT})
|
||||
-IF (XCODE)
|
||||
- SET (CMD "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/\${CONFIGURATION}/H5detect")
|
||||
-ENDIF (XCODE)
|
||||
-ADD_EXECUTABLE (H5detect ${HDF5_SRC_DIR}/H5detect.c)
|
||||
-IF (WIN32)
|
||||
- TARGET_LINK_LIBRARIES (H5detect "ws2_32.lib")
|
||||
-ENDIF (WIN32)
|
||||
+IF(NOT CMAKE_CROSSCOMPILING)
|
||||
+ ADD_EXECUTABLE (H5detect ${HDF5_SRC_DIR}/H5detect.c)
|
||||
+ IF (WIN32)
|
||||
+ TARGET_LINK_LIBRARIES (H5detect "ws2_32.lib")
|
||||
+ ENDIF (WIN32)
|
||||
+
|
||||
+ EXPORT(TARGETS H5detect FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND)
|
||||
+ IF(COMPILE_TOOLS_TARGET)
|
||||
+ ADD_DEPENDENCIES(${COMPILE_TOOLS_TARGET} H5detect)
|
||||
+ ENDIF(COMPILE_TOOLS_TARGET)
|
||||
+ENDIF(NOT CMAKE_CROSSCOMPILING)
|
||||
|
||||
ADD_CUSTOM_COMMAND (
|
||||
OUTPUT ${HDF5_BINARY_DIR}/H5Tinit.c
|
||||
- COMMAND ${CMD}
|
||||
+ COMMAND H5detect
|
||||
ARGS > ${HDF5_BINARY_DIR}/H5Tinit.c
|
||||
DEPENDS H5detect
|
||||
)
|
||||
|
||||
-SET (CMDL ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}${CFG_INIT}/H5make_libsettings${EXE_EXT})
|
||||
-IF (XCODE)
|
||||
- SET (CMDL "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/\${CONFIGURATION}/H5make_libsettings")
|
||||
-ENDIF (XCODE)
|
||||
-ADD_EXECUTABLE (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c)
|
||||
-IF (WIN32)
|
||||
- TARGET_LINK_LIBRARIES (H5make_libsettings "ws2_32.lib")
|
||||
-ENDIF (WIN32)
|
||||
+IF(NOT CMAKE_CROSSCOMPILING)
|
||||
+ ADD_EXECUTABLE (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c)
|
||||
+ IF (WIN32)
|
||||
+ TARGET_LINK_LIBRARIES (H5make_libsettings "ws2_32.lib")
|
||||
+ ENDIF (WIN32)
|
||||
|
||||
+ EXPORT(TARGETS H5make_libsettings FILE ${EXPORT_EXECUTABLES_FILE} NAMESPACE "${EXPORT_EXECUTABLES_NAMESPACE}" APPEND)
|
||||
+ IF(COMPILE_TOOLS_TARGET)
|
||||
+ ADD_DEPENDENCIES(${COMPILE_TOOLS_TARGET} H5make_libsettings)
|
||||
+ ENDIF(COMPILE_TOOLS_TARGET)
|
||||
+ENDIF(NOT CMAKE_CROSSCOMPILING)
|
||||
+
|
||||
ADD_CUSTOM_COMMAND (
|
||||
OUTPUT ${HDF5_BINARY_DIR}/H5lib_settings.c
|
||||
- COMMAND ${CMDL}
|
||||
+ COMMAND H5make_libsettings
|
||||
ARGS > ${HDF5_BINARY_DIR}/H5lib_settings.c
|
||||
DEPENDS H5make_libsettings
|
||||
)
|
||||
|
||||
--- VTK/CMakeLists.txt 2011-08-24 15:37:07.000000000 +0200
|
||||
+++ VTK/CMakeLists.txt 2011-10-31 09:12:59.451958504 +0100
|
||||
@@ -42,8 +42,13 @@
|
||||
FILE(WRITE "${EXPORT_EXECUTABLES_FILE}" "#generated by VTK, do not edit\n")
|
||||
ENDIF(NOT EXPORT_EXECUTABLES_FILE)
|
||||
|
||||
+# Add a target for building only the compile tools
|
||||
+ADD_CUSTOM_TARGET(CompileTools)
|
||||
+SET(COMPILE_TOOLS_TARGET "CompileTools")
|
||||
+
|
||||
GET_PROPERTY(VTK_TARGET_SUPPORTS_SHARED_LIBS
|
||||
GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
|
||||
+
|
||||
|
||||
# Warn when using "old style" CMake install commands... But only when
|
||||
# building VTK itself.
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
diff -r 26cf498f1dac Utilities/CMakeLists.txt
|
||||
--- a/Utilities/CMakeLists.txt Tue Nov 22 18:02:40 2011 +1100
|
||||
+++ b/Utilities/CMakeLists.txt Tue Nov 22 18:04:01 2011 +1100
|
||||
@@ -68,10 +68,8 @@
|
||||
VTK_THIRD_PARTY_SUBDIR(Cosmo Cosmo)
|
||||
ENDIF(VTK_USE_PARALLEL)
|
||||
|
||||
-IF(VTK_USE_RENDERING)
|
||||
- ADD_SUBDIRECTORY(ftgl)
|
||||
- ADD_SUBDIRECTORY(ParseOGLExt)
|
||||
-ENDIF(VTK_USE_RENDERING)
|
||||
+ADD_SUBDIRECTORY(ftgl)
|
||||
+ADD_SUBDIRECTORY(ParseOGLExt)
|
||||
|
||||
IF(NOT VTK_INSTALL_NO_DEVELOPMENT)
|
||||
INSTALL(FILES
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
This patch has been taken from:
|
||||
|
||||
http://www.vtk.org/Bug/view.php?id=12746
|
||||
|
||||
diff -r 39846999f521 CMake/vtkThirdParty.cmake
|
||||
--- a/CMake/vtkThirdParty.cmake Wed Nov 23 19:06:30 2011 +1100
|
||||
+++ b/CMake/vtkThirdParty.cmake Wed Nov 23 19:10:41 2011 +1100
|
||||
@@ -3,11 +3,11 @@
|
||||
OPTION(VTK_USE_SYSTEM_${upper} "Use the system's ${lower} library." OFF)
|
||||
MARK_AS_ADVANCED(VTK_USE_SYSTEM_${upper})
|
||||
IF(VTK_USE_SYSTEM_${upper})
|
||||
- IF(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake)
|
||||
- INCLUDE(${CMAKE_ROOT}/Modules/Find${upper}.cmake)
|
||||
- ELSE(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake)
|
||||
- INCLUDE(${VTK_CMAKE_DIR}/Find${upper}.cmake)
|
||||
- ENDIF(EXISTS ${CMAKE_ROOT}/Modules/Find${upper}.cmake)
|
||||
+ IF(EXISTS ${VTK_CMAKE_DIR}/Find${upper}.cmake)
|
||||
+ INCLUDE(${VTK_CMAKE_DIR}/Find${upper}.cmake)
|
||||
+ ELSE(EXISTS ${VTK_CMAKE_DIR}/Find${upper}.cmake)
|
||||
+ INCLUDE(${CMAKE_ROOT}/Modules/Find${upper}.cmake)
|
||||
+ ENDIF(EXISTS ${VTK_CMAKE_DIR}/Find${upper}.cmake)
|
||||
MARK_AS_ADVANCED(${upper}_INCLUDE_DIR ${upper}_LIBRARY)
|
||||
IF(${upper}_FOUND)
|
||||
SET(VTK_${upper}_LIBRARIES ${${upper}_LIBRARIES})
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
diff -ur VTK.orig/Utilities/vtkhdf5/src/H5private.h VTK/Utilities/vtkhdf5/src/H5private.h
|
||||
--- VTK.orig/Utilities/vtkhdf5/src/H5private.h 2011-11-28 00:12:17.000000000 +1100
|
||||
+++ VTK/Utilities/vtkhdf5/src/H5private.h 2011-11-28 00:16:22.000000000 +1100
|
||||
@@ -141,7 +141,7 @@
|
||||
# include <sys/sysinfo.h>
|
||||
#endif
|
||||
/* Prevent compile errors with GCC 4.3 on Solaris 2.10 */
|
||||
-#if defined (__SVR4) && defined (__sun)
|
||||
+#if defined (__SVR4) && defined (__sun) || defined(__FreeBSD_kernel__) && defined(__GLIBC__)
|
||||
/* In file included from /usr/include/sys/klwp.h:19,
|
||||
* from /usr/include/sys/thread.h:13,
|
||||
* from /usr/include/sys/proc.h:20,
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
This patch has been taken from:
|
||||
http://vtk.org/Bug/print_bug_page.php?bug_id=11742
|
||||
|
||||
diff -ur VTK6.0.0.rc3/Hybrid/vtkWin32VideoSource.cxx VTK6.0.0.rc3.new/IO/Video/vtkWin32VideoSource.cxx
|
||||
--- VTK6.0.0.rc3/Hybrid/vtkWin32VideoSource.cxx 2013-06-13 05:47:10.000000000 +1000
|
||||
+++ VTK6.0.0.rc3.new/Hybrid/vtkWin32VideoSource.cxx 2013-06-22 16:06:01.000000000 +1000
|
||||
@@ -274,7 +274,7 @@
|
||||
}
|
||||
|
||||
// set the user data to 'this'
|
||||
- vtkSetWindowLong(this->Internal->ParentWnd,vtkGWL_USERDATA,(vtkLONG)this);
|
||||
+ vtkSetWindowLong(this->Internal->ParentWnd,vtkGWL_USERDATA,(intptr_t)this);
|
||||
|
||||
// Create the capture window
|
||||
this->Internal->CapWnd = capCreateCaptureWindow("Capture",
|
||||
@@ -339,7 +339,7 @@
|
||||
}
|
||||
|
||||
// set user data for callbacks
|
||||
- if (!capSetUserData(this->Internal->CapWnd,(long)this))
|
||||
+ if (!capSetUserData(this->Internal->CapWnd,(intptr_t)this))
|
||||
{
|
||||
vtkErrorMacro(<< "Initialize: couldn't set user data for callback"\
|
||||
<< " (" << GetLastError() << ")");
|
||||
|
||||
Loading…
Reference in New Issue