Merge pull request #239 from sikoragmbh/vtk6-fix-gl

package vtk6: strip down native configure to required compile tools

3 files changed, 32 insertions, 49 deletions

diff --git a/src/vtk6-3-config-compiletools.patch b/src/vtk6-3-config-compiletools.patch
new file mode 100644
index 0000000..5b49247
--- /dev/null
+++ b/src/vtk6-3-config-compiletools.patch
@@ -0,0 +1,28 @@
+--- VTK6.0.0/Utilities/EncodeString/module.cmake	2013-06-12 21:47:10.000000000 +0200
++++ VTK6.0.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.0.0/Utilities/HashSource/module.cmake	2013-06-12 21:47:10.000000000 +0200
++++ VTK6.0.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.0.0/Utilities/MaterialLibrary/module.cmake	2013-06-12 21:47:10.000000000 +0200
++++ VTK6.0.0/Utilities/MaterialLibrary/module.cmake	2013-08-29 09:58:54.939480759 +0200
+@@ -1,4 +1,6 @@
+ vtk_module(vtkUtilitiesMaterialLibrary
++  GROUPS
++    CompileTools
+   DEPENDS
+     vtksys
+   EXCLUDE_FROM_WRAPPING
diff --git a/src/vtk6-3-optional-osmesa.patch b/src/vtk6-3-optional-osmesa.patch
deleted file mode 100644
index 3767f3d..0000000
--- a/src/vtk6-3-optional-osmesa.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
---- VTK6.0.0/Rendering/OpenGL/CMakeLists.txt	2013-06-12 21:47:10.000000000 +0200
-+++ VTK6.0.0/Rendering/OpenGL/CMakeLists.txt	2013-08-27 13:15:06.770690266 +0200
-@@ -29,7 +29,7 @@
- if(VTK_USE_X OR VTK_USE_CARBON OR VTK_USE_COCOA OR WIN32)
-   set(VTK_USE_OSMESA FALSE)
- else()
--  set(VTK_USE_OSMESA TRUE)
-+  option(VTK_USE_OSMESA "Use OSMesa for VTK render windows" ON)
- endif()
- 
- # FIXME: The TDx support needs some refactoring before we can build it in a
-@@ -136,7 +136,7 @@
- 
- if(VTK_USE_OSMESA)
-   find_package(OpenGL)
--else()
-+elseif(VTK_USE_X)
-   find_package(OpenGL REQUIRED)
- endif()
- 
---- VTK6.0.0/ThirdParty/gl2ps/vtkgl2ps/CMakeLists.txt	2013-06-12 21:47:10.000000000 +0200
-+++ VTK6.0.0/ThirdParty/gl2ps/vtkgl2ps/CMakeLists.txt	2013-08-28 13:45:16.297181334 +0200
-@@ -4,16 +4,16 @@
- include_regular_expression(".*")
- 
- # Depend on OpenGL
--if(NOT VTK_OPENGL_HAS_OSMESA)
--  find_package(OpenGL REQUIRED)
--  set(GL2PS_GL_LIBRARIES ${OPENGL_LIBRARIES})
--  set(GL2PS_GL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR})
--else()
-+if(VTK_OPENGL_HAS_OSMESA)
-   set(GL2PS_GL_LIBRARIES ${OSMESA_LIBRARY})
-   set(GL2PS_GL_INCLUDE_DIR ${OSMESA_INCLUDE_DIR})
-   if(OPENGL_gl_LIBRARY)
-     list(APPEND GL2PS_GL_LIBRARIES ${OPENGL_gl_LIBRARY})
-   endif()
-+elseif(VTK_USE_X)
-+  find_package(OpenGL REQUIRED)
-+  set(GL2PS_GL_LIBRARIES ${OPENGL_LIBRARIES})
-+  set(GL2PS_GL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR})
- endif()
- 
- # Need math on UNIX
diff --git a/src/vtk6.mk b/src/vtk6.mk
index e1ff011..a651d4c 100644
--- a/src/vtk6.mk
+++ b/src/vtk6.mk
@@ -24,9 +24,11 @@ define $(PKG)_BUILD
     # first we need a native build to create the compile tools
     mkdir '$(1).native_build'
     cd '$(1).native_build' && cmake \
+        -DVTK_BUILD_ALL_MODULES=FALSE \
+        -DVTK_Group_Rendering=FALSE \
+        -DVTK_Group_StandAlone=FALSE \
+        -DVTK_Group_CompileTools=TRUE \
         -DBUILD_TESTING=FALSE \
-        -DVTK_USE_X=FALSE \
-        -DVTK_USE_OSMESA=FALSE \
         -DCMAKE_BUILD_TYPE="Release" \
         '$(1)'
     $(MAKE) -C '$(1).native_build' -j '$(JOBS)' VERBOSE=1 vtkCompileTools