package vtk6: update

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
This commit is contained in:
Martin Müllenhaupt 2014-08-25 14:17:33 +02:00 committed by MXE
parent 9938f9bbfe
commit 5459134799
2 changed files with 5 additions and 16 deletions

View File

@ -16,15 +16,6 @@ See index.html for further information.
@@ -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

View File

@ -3,10 +3,10 @@
PKG := vtk6
$(PKG)_IGNORE :=
$(PKG)_VERSION := 6.0.0
$(PKG)_CHECKSUM := 51dd3b4a779d5442dd74375363f0f0c2d6eaf3fa
$(PKG)_SUBDIR := VTK$($(PKG)_VERSION)
$(PKG)_FILE := vtk-$($(PKG)_VERSION).tar.gz
$(PKG)_VERSION := 6.1.0
$(PKG)_CHECKSUM := 91d1303558c7276f031f8ffeb47b4233f2fd2cd9
$(PKG)_SUBDIR := VTK-$($(PKG)_VERSION)
$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz
$(PKG)_URL := http://www.vtk.org/files/release/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
$(PKG)_DEPS := gcc hdf5 qt
@ -42,7 +42,7 @@ define $(PKG)_BUILD
-C '$(1)/TryRunResults.cmake' \
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DVTKCompileTools_DIR='$(1).native_build' \
-DBUILD_SHARED_LIBS=FALSE \
-DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),FALSE,TRUE) \
-DModule_vtkGUISupportQt=TRUE \
-DModule_vtkGUISupportQtOpenGL=TRUE \
-DQT_QMAKE_EXECUTABLE=$(PREFIX)/$(TARGET)/qt/bin/qmake \
@ -54,5 +54,3 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1).cross_build' -j '$(JOBS)' VERBOSE=1 || $(MAKE) -C '$(1).cross_build' -j 1 VERBOSE=1
$(MAKE) -C '$(1).cross_build' -j 1 install VERBOSE=1
endef
$(PKG)_BUILD_SHARED =