From a540f21be61eb8602f37e0e427c361366447c8dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= Date: Fri, 21 Jul 2017 13:27:14 +0200 Subject: vtk: update to version 8 and remove package vtk6 --- src/cmake/modules/TryRunResults.cmake | 9 + src/vtk-1-fixes.patch | 607 ++++------------------------------ src/vtk.mk | 94 +++--- src/vtk6-1-fixes.patch | 85 ----- src/vtk6.mk | 63 ---- 5 files changed, 121 insertions(+), 737 deletions(-) delete mode 100644 src/vtk6-1-fixes.patch delete mode 100644 src/vtk6.mk diff --git a/src/cmake/modules/TryRunResults.cmake b/src/cmake/modules/TryRunResults.cmake index 0b9516d..9e94acc 100644 --- a/src/cmake/modules/TryRunResults.cmake +++ b/src/cmake/modules/TryRunResults.cmake @@ -154,3 +154,12 @@ set( C_CHAR_SIGNED set( C_CHAR_SIGNED__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE) +set( HAVE_IOEO_EXITCODE + "0" + CACHE STRING "Result 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) diff --git a/src/vtk-1-fixes.patch b/src/vtk-1-fixes.patch index aa44f0f..1e13226 100644 --- a/src/vtk-1-fixes.patch +++ b/src/vtk-1-fixes.patch @@ -3,553 +3,68 @@ This file is part of MXE. See LICENSE.md for licensing information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Muellni -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) +From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= +Date: Sat, 22 Jun 2013 18:44:18 +1000 +Subject: [PATCH] fix libharu shared linking + + +--- a/IO/Export/CMakeLists.txt 2017-05-19 15:20:47.000000000 +0200 ++++ b/IO/Export/CMakeLists.txt 2017-06-05 11:13:51.646391244 +0200 +@@ -33,6 +33,16 @@ + ABSTRACT + ) + ++if(VTK_BUILD_SHARED_LIBS) ++ set_source_files_properties( ++ vtkPDFContextDevice2D.cxx ++ vtkPDFExporter.cxx ++ PROPERTIES ++ COMPILE_DEFINITIONS ++ HPDF_DLL ++ ) ++endif() + -+SET( KWSYS_LFS_WORKS -+ "0" -+ CACHE STRING "Result from TRY_RUN" FORCE) + vtk_module_library(vtkIOExport ${Module_SRCS}) + include(vtkOpenGL) + vtk_opengl_link(vtkIOExport) +--- a/CMake/FindLibHaru.cmake 2017-05-19 15:20:47.000000000 +0200 ++++ b/VTK-8.0.0.rc1/CMake/FindLibHaru.cmake 2017-06-05 12:56:24.120790922 +0200 +@@ -19,7 +19,7 @@ + + find_path(LIBHARU_INCLUDE_DIR hpdf.h) + +-find_library(LIBHARU_LIBRARY NAMES hpdf) ++find_library(LIBHARU_LIBRARY NAMES hpdf hpdfs) + + # handle the QUIETLY and REQUIRED arguments and set FONTCONFIG_FOUND to TRUE if + # all listed variables are TRUE +--- a/Rendering/OpenGL2/CMakeLists.txt 2017-05-19 15:20:47.000000000 +0200 ++++ b/Rendering/OpenGL2/CMakeLists.txt 2017-06-06 01:11:16.512084625 +0200 +@@ -122,6 +122,11 @@ + vtkTransformFeedback + WRAP_EXCLUDE) + ++if(NOT VTK_BUILD_SHARED_LIBS) ++ set_source_files_properties(${Module_SRCS} ++ PROPERTIES COMPILE_DEFINITIONS GLEW_STATIC) ++endif() + -+SET( KWSYS_LFS_WORKS__TRYRUN_OUTPUT -+ "" -+ CACHE STRING "Output from TRY_RUN" FORCE) -+ - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Muellni -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 -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 + set_source_files_properties( + ${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}ObjectFactory.cxx + vtkOpenGLGL2PSHelper + --- 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 -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 -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 -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 - #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 -Date: Wed, 21 Sep 2011 13:19:30 -0400 -Subject: [PATCH] Merge branch '11742_mingw64_compile_fixes' into release - -Style fixes were removed by Boris Nagaev . - -diff --git a/Common/vtkWin32Header.h b/Common/vtkWin32Header.h -index 1111111..2222222 100644 ---- a/Common/vtkWin32Header.h -+++ b/Common/vtkWin32Header.h -@@ -102,9 +102,15 @@ Do_not_include_vtkWin32Header_directly__vtkSystemIncludes_includes_it; - # define vtkGetWindowLong GetWindowLong - # define vtkSetWindowLong SetWindowLong - # define vtkLONG LONG -+# ifdef _WIN64 -+# define vtkGWL_WNDPROC GWLP_WNDPROC -+# define vtkGWL_HINSTANCE GWLP_HINSTANCE -+# define vtkGWL_USERDATA GWLP_USERDATA -+# else - # define vtkGWL_WNDPROC GWL_WNDPROC - # define vtkGWL_HINSTANCE GWL_HINSTANCE - # define vtkGWL_USERDATA GWL_USERDATA -+# endif - #endif // - - #endif -diff --git a/Hybrid/vtkVideoSource.cxx b/Hybrid/vtkVideoSource.cxx -index 1111111..2222222 100644 ---- a/Hybrid/vtkVideoSource.cxx -+++ b/Hybrid/vtkVideoSource.cxx -@@ -432,7 +432,7 @@ void vtkVideoSource::InternalGrab() - ptr = reinterpret_cast(this->FrameBuffer[index])->GetPointer(0); - - // Somebody should check this: -- lptr = (int *)(((((long)ptr) + 3)/4)*4); -+ lptr = (int *)(((((intptr_t)ptr) + 3)/4)*4); - i = totalSize/4; - - while (--i >= 0) -diff --git a/Rendering/vtkFreeTypeTools.cxx b/Rendering/vtkFreeTypeTools.cxx -index 1111111..2222222 100644 ---- a/Rendering/vtkFreeTypeTools.cxx -+++ b/Rendering/vtkFreeTypeTools.cxx -@@ -222,7 +222,7 @@ vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id, - // Map the ID to a text property - vtkSmartPointer tprop = - vtkSmartPointer::New(); -- self->MapIdToTextProperty(reinterpret_cast(face_id), tprop); -+ self->MapIdToTextProperty(reinterpret_cast(face_id), tprop); - - // Fonts, organized by [Family][Bold][Italic] - static EmbeddedFontStruct EmbeddedFonts[3][2][2] = -diff --git a/Rendering/vtkFreeTypeUtilities.cxx b/Rendering/vtkFreeTypeUtilities.cxx -index 1111111..2222222 100644 ---- a/Rendering/vtkFreeTypeUtilities.cxx -+++ b/Rendering/vtkFreeTypeUtilities.cxx -@@ -337,7 +337,7 @@ vtkFreeTypeUtilitiesFaceRequester(FTC_FaceID face_id, - // Map the ID to a text property - - vtkTextProperty *tprop = vtkTextProperty::New(); -- self->MapIdToTextProperty(reinterpret_cast(face_id), tprop); -+ self->MapIdToTextProperty(reinterpret_cast(face_id), tprop); - - // Fonts, organized by [Family][Bold][Italic] - -diff --git a/Rendering/vtkWin32OpenGLRenderWindow.cxx b/Rendering/vtkWin32OpenGLRenderWindow.cxx -index 1111111..2222222 100644 ---- a/Rendering/vtkWin32OpenGLRenderWindow.cxx -+++ b/Rendering/vtkWin32OpenGLRenderWindow.cxx -@@ -842,7 +842,7 @@ void vtkWin32OpenGLRenderWindow::CreateAWindow() - } - //UpdateWindow(this->WindowId); - this->OwnWindow = 1; -- vtkSetWindowLong(this->WindowId,sizeof(vtkLONG),(vtkLONG)this); -+ vtkSetWindowLong(this->WindowId,sizeof(vtkLONG),(intptr_t)this); - } - if (!this->DeviceContext) - { -diff --git a/Rendering/vtkWin32RenderWindowInteractor.cxx b/Rendering/vtkWin32RenderWindowInteractor.cxx -index 1111111..2222222 100644 ---- a/Rendering/vtkWin32RenderWindowInteractor.cxx -+++ b/Rendering/vtkWin32RenderWindowInteractor.cxx -@@ -17,10 +17,12 @@ - #include - #include - --#define _WIN32_WINNT 0x0400 // for trackmouseevent support requires Win95 with IE 3.0 or greater. -- - #include "vtkWin32OpenGLRenderWindow.h" - -+#ifndef _WIN32_WINNT -+#define _WIN32_WINNT 0x0400 // for trackmouseevent support requires Win95 with IE 3.0 or greater. -+#endif -+ - // Mouse wheel support - // In an ideal world we would just have to include , but it is not - // always available with all compilers/headers -@@ -91,11 +93,11 @@ vtkWin32RenderWindowInteractor::~vtkWin32RenderWindowInteractor() - // well send a USER message to the other - // event handler so that it can properly - // call this event handler if required -- CallWindowProc(this->OldProc,this->WindowId,WM_USER+14,28,(LONG)this->OldProc); -+ CallWindowProc(this->OldProc,this->WindowId,WM_USER+14,28,(intptr_t)this->OldProc); - } - else - { -- vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(vtkLONG)this->OldProc); -+ vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(intptr_t)this->OldProc); - } - this->Enabled = 0; - } -@@ -182,11 +184,11 @@ void vtkWin32RenderWindowInteractor::Enable() - // well send a USER message to the other - // event handler so that it can properly - // call this event handler if required -- CallWindowProc(this->OldProc,this->WindowId,WM_USER+12,24,(LONG)vtkHandleMessage); -+ CallWindowProc(this->OldProc,this->WindowId,WM_USER+12,24,(intptr_t)vtkHandleMessage); - } - else - { -- vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(vtkLONG)vtkHandleMessage); -+ vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(intptr_t)vtkHandleMessage); - } - - #ifdef VTK_USE_TDX -@@ -232,11 +234,11 @@ void vtkWin32RenderWindowInteractor::Disable() - // well send a USER message to the other - // event handler so that it can properly - // call this event handler if required -- CallWindowProc(this->OldProc,this->WindowId,WM_USER+14,28,(LONG)this->OldProc); -+ CallWindowProc(this->OldProc,this->WindowId,WM_USER+14,28,(intptr_t)this->OldProc); - } - else - { -- vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(vtkLONG)this->OldProc); -+ vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(intptr_t)this->OldProc); - } - #ifdef VTK_USE_TDX - if(this->Device->GetInitialized()) - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tony Theodore -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() << ")"); - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sat, 19 Dec 2015 02:36:12 +0300 -Subject: [PATCH] cmake: use STREQUAL, not MATCHES to compare paths - -See https://github.com/mxe/mxe/issues/1087 - -diff --git a/Utilities/MaterialLibrary/CMakeLists.txt b/Utilities/MaterialLibrary/CMakeLists.txt -index 1111111..2222222 100644 ---- a/Utilities/MaterialLibrary/CMakeLists.txt -+++ b/Utilities/MaterialLibrary/CMakeLists.txt -@@ -91,13 +91,13 @@ ENDMACRO(COPY_FILES_TO_DIR) - - # Shaders/Materials provided in Utilities/MaterialLibrary/Repository - # are copied over to the binary dir. --IF (NOT "${VTK_BINARY_DIR}" MATCHES "^${VTK_SOURCE_DIR}$") -+IF (NOT "${VTK_BINARY_DIR}" STREQUAL "${VTK_SOURCE_DIR}") - # Ensure that the Source and Build dir are not same. - # In that case we don't need to copy anything. - COPY_FILES_TO_DIR(${MaterialLibrary_SOURCE_DIR}/Repository - ${VTK_DEFAULT_SHADERS_DIR}) - --ENDIF (NOT "${VTK_BINARY_DIR}" MATCHES "^${VTK_SOURCE_DIR}$") -+ENDIF (NOT "${VTK_BINARY_DIR}" STREQUAL "${VTK_SOURCE_DIR}") - - # Build the ShaderCodes Library. - SET (CgCodes -diff --git a/Utilities/vtkTclTest2Py/CMakeLists.txt b/Utilities/vtkTclTest2Py/CMakeLists.txt -index 1111111..2222222 100644 ---- a/Utilities/vtkTclTest2Py/CMakeLists.txt -+++ b/Utilities/vtkTclTest2Py/CMakeLists.txt -@@ -40,9 +40,9 @@ IF(PYTHON_EXECUTABLE AND VTK_WRAP_PYTHON) - SET(VTK_PYTHON_SOURCE_FILES ${VTK_PYTHON_SOURCE_FILES} ${src}) - ENDFOREACH(file) - -- IF ("${VTK_BINARY_DIR}" MATCHES "^${VTK_SOURCE_DIR}$") -+ IF ("${VTK_BINARY_DIR}" STREQUAL "${VTK_SOURCE_DIR}") - #MESSAGE("In source build -- no need to copy Python files.") -- ELSE ("${VTK_BINARY_DIR}" MATCHES "^${VTK_SOURCE_DIR}$") -+ ELSE ("${VTK_BINARY_DIR}" STREQUAL "${VTK_SOURCE_DIR}") - FOREACH(file ${VTK_PYTHON_FILES}) - SET(src "${VTK_SOURCE_DIR}/Utilities/vtkTclTest2Py/${file}.py") - SET(tgt "${VTK_BINARY_DIR}/Utilities/vtkTclTest2Py/${file}.py") -@@ -52,7 +52,7 @@ IF(PYTHON_EXECUTABLE AND VTK_WRAP_PYTHON) - OUTPUT ${tgt} - COMMENT "source copy") - ENDFOREACH(file) -- ENDIF ("${VTK_BINARY_DIR}" MATCHES "^${VTK_SOURCE_DIR}$") -+ ENDIF ("${VTK_BINARY_DIR}" STREQUAL "${VTK_SOURCE_DIR}") - - # Byte compile the Python files. - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/compile_all_vtk.py.in -diff --git a/Wrapping/Python/CMakeLists.txt b/Wrapping/Python/CMakeLists.txt -index 1111111..2222222 100644 ---- a/Wrapping/Python/CMakeLists.txt -+++ b/Wrapping/Python/CMakeLists.txt -@@ -468,7 +468,7 @@ IF(PYTHON_EXECUTABLE) - SET(VTK_PYTHON_SOURCE_FILES ${VTK_PYTHON_SOURCE_FILES} ${src}) - ENDFOREACH(file) - -- IF (NOT "${VTK_BINARY_DIR}" MATCHES "^${VTK_SOURCE_DIR}$") -+ IF (NOT "${VTK_BINARY_DIR}" STREQUAL "${VTK_SOURCE_DIR}") - FOREACH(file ${VTK_PYTHON_FILES}) - SET(src "${VTK_SOURCE_DIR}/Wrapping/Python/${file}.py") - SET(tgt "${VTK_BINARY_DIR}/Wrapping/Python/${file}.py") -@@ -477,7 +477,7 @@ IF(PYTHON_EXECUTABLE) - OUTPUT ${tgt} - COMMENT "source copy") - ENDFOREACH(file) -- ENDIF (NOT "${VTK_BINARY_DIR}" MATCHES "^${VTK_SOURCE_DIR}$") -+ ENDIF (NOT "${VTK_BINARY_DIR}" STREQUAL "${VTK_SOURCE_DIR}") - - # handle the different configuration types (each will have identical files) - SET(VTK_PYTHON_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES}) - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Manuel Massing -Date: Tue, 25 Apr 2017 12:32:34 +0200 -Subject: [PATCH] cmake: update regex to also match gcc6 versions - - -diff --git a/CMake/vtkCompilerExtras.cmake b/CMake/vtkCompilerExtras.cmake -index 1111111..2222222 100644 ---- a/CMake/vtkCompilerExtras.cmake -+++ b/CMake/vtkCompilerExtras.cmake -@@ -25,7 +25,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) - # Now check if we can use visibility to selectively export symbols - exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE - _gcc_version_info) -- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" -+ string (REGEX MATCH "[3456]\\.[0-9]\\.[0-9]" - _gcc_version "${_gcc_version_info}") - if(NOT _gcc_version) - string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" +@@ -251,9 +251,9 @@ endif() + # Full functional CMAKE_CROSSCOMPILING_EMULATOR support for custom_command and + # custom_target is available in CMake 3.8.0 + # It was first added in CMake 3.6.0 and later fixed in CMake 3.8.0 (commit e7480d67, CMake issue #16288) +-set(_crosscompiling_emulator_support_custom_target 1) +-if(CMAKE_VERSION VERSION_LESS 3.8.0) +- set(_crosscompiling_emulator_support_custom_target 0) ++set(_crosscompiling_emulator_support_custom_target 0) ++if(DEFINED CMAKE_CROSSCOMPILING_EMULATOR AND NOT CMAKE_VERSION VERSION_LESS 3.8.0) ++ set(_crosscompiling_emulator_support_custom_target 1) + endif() + # Maintain backward compatibility with user setting COMPILE_TOOLS_IMPORTED + if(DEFINED COMPILE_TOOLS_IMPORTED AND NOT DEFINED VTK_COMPILE_TOOLS_IMPORTED) diff --git a/src/vtk.mk b/src/vtk.mk index 87e7a8c..536e36b 100644 --- a/src/vtk.mk +++ b/src/vtk.mk @@ -1,58 +1,66 @@ # This file is part of MXE. See LICENSE.md for licensing information. -PKG := vtk -$(PKG)_WEBSITE := http://www.vtk.org/ -$(PKG)_IGNORE := 5.10% -$(PKG)_VERSION := 5.8.0 -$(PKG)_CHECKSUM := 83ee74b83403590342c079a52b06eef7ab862417f941d5f4558aea25c6bbc2d5 -$(PKG)_SUBDIR := VTK -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://www.vtk.org/files/release/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) -$(PKG)_DEPS := gcc expat freetype hdf5 jpeg libodbc++ libpng libxml2 postgresql qt tiff zlib +PKG := vtk +$(PKG)_IGNORE := +$(PKG)_VERSION := 8.0.0 +$(PKG)_CHECKSUM := c7e727706fb689fb6fd764d3b47cac8f4dc03204806ff19a10dfd406c6072a27 +$(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)_QT_VERSION := 5 +$(PKG)_DEPS := gcc hdf5 qtbase qttools libpng expat libxml2 jsoncpp tiff freetype lz4 hdf5 libharu glew define $(PKG)_UPDATE $(WGET) -q -O- 'http://vtk.org/gitweb?p=VTK.git;a=tags' | \ - grep 'refs/tags/v5[0-9.]*"' | \ + grep 'refs/tags/v[0-9.]*"' | \ $(SED) 's,.*refs/tags/v\(.*\)".*,\1,g;' | \ - head -1 + grep -v rc | \ + $(SORT) -V | \ + tail -1 endef define $(PKG)_BUILD - # first we need a native build to create the compile tools - mkdir '$(1)/native_build' - cd '$(1)/native_build' && cmake \ + mkdir '$(1).native_build' + cd '$(1).native_build' && '$(PREFIX)/$(BUILD)/bin/cmake' \ -DBUILD_TESTING=FALSE \ - -DOPENGL_INCLUDE_DIR='$(1)/Utilities/ParseOGLExt/headers' \ - -DVTK_USE_RENDERING=FALSE \ - .. + -DCMAKE_BUILD_TYPE="Release" \ + '$(1)' + $(MAKE) -C '$(1).native_build' -j '$(JOBS)' VERBOSE=1 vtkCompileTools - # only the newly created CompileTools target need to be built - $(MAKE) -C '$(1)/native_build' -j '$(JOBS)' VERBOSE=1 CompileTools + # DirectX is detected on Mac OSX but we use OpenGL + $(SED) -i 's,d3d9,nod3d9,g' '$(1)/CMake/FindDirectX.cmake' - # DirectX is detected on Mac OSX but requires a DX10 header - dxgi.h - rm '$(1)/CMake/FindDirectX.cmake' + # now the cross compilation + mkdir '$(1).cross_build' + cd '$(1).cross_build' && '$(TARGET)-cmake' \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DVTKCompileTools_DIR='$(1).native_build' \ + -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),FALSE,TRUE) \ + -DVTK_Group_Qt=ON \ + -DVTK_Group_Imaging=ON \ + -DVTK_QT_VERSION=$($(PKG)_QT_VERSION) \ + -DVTK_USE_CXX11_FEATURES=ON \ + -DVTK_USE_SYSTEM_LIBRARIES=OFF \ + -DVTK_USE_SYSTEM_LIBPROJ4=OFF \ + -DVTK_USE_SYSTEM_NETCDF=OFF \ + -DVTK_USE_SYSTEM_NETCDFCPP=OFF \ + -DVTK_USE_SYSTEM_GL2PS=OFF \ + -DVTK_USE_SYSTEM_TIFF=ON \ + -DVTK_USE_SYSTEM_HDF5=ON \ + -DVTK_USE_SYSTEM_GLEW=ON \ + -DVTK_FORBID_DOWNLOADS=ON \ + -DVTK_USE_SYSTEM_LIBHARU=ON \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_TESTING=OFF \ + '$(1)' + $(MAKE) -C '$(1).cross_build' -j '$(JOBS)' VERBOSE=1 install - # now for the cross compilation - mkdir '$(1)/cross_build' - cd '$(1)/cross_build' && '$(TARGET)-cmake' \ - -C '$(1)/TryRunResults.cmake'\ - -DBUILD_TESTING=FALSE\ - -DVTKCompileTools_DIR='$(1)/native_build'\ - -DVTK_USE_SYSTEM_EXPAT=TRUE\ - -DVTK_USE_SYSTEM_FREETYPE=FALSE\ - -DVTK_USE_SYSTEM_HDF5=TRUE \ - -DVTK_USE_SYSTEM_JPEG=TRUE\ - -DVTK_USE_SYSTEM_LIBXML2=TRUE\ - -DVTK_USE_SYSTEM_PNG=TRUE\ - -DVTK_USE_SYSTEM_TIFF=TRUE\ - -DVTK_USE_SYSTEM_ZLIB=TRUE\ - -DVTK_USE_QT=TRUE\ - -DVTK_USE_POSTGRES=TRUE\ - -DVTK_USE_ODBC=TRUE\ - .. - $(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 + #now build the GUI -> Qt -> SimpleView Example + mkdir '$(1).test' + cd '$(1).test' && '$(TARGET)-cmake' \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + '$(1)/Examples/GUI/Qt/SimpleView' + $(MAKE) -C '$(1).test' -j '$(JOBS)' VERBOSE=1 + $(INSTALL) '$(1).test/SimpleView.exe' $(PREFIX)/$(TARGET)/bin/test-$(PKG).exe endef - -$(PKG)_BUILD_SHARED = diff --git a/src/vtk6-1-fixes.patch b/src/vtk6-1-fixes.patch deleted file mode 100644 index cac6a27..0000000 --- a/src/vtk6-1-fixes.patch +++ /dev/null @@ -1,85 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing 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?= -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?= -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) diff --git a/src/vtk6.mk b/src/vtk6.mk deleted file mode 100644 index 980ff75..0000000 --- a/src/vtk6.mk +++ /dev/null @@ -1,63 +0,0 @@ -# This file is part of MXE. See LICENSE.md for licensing information. - -PKG := vtk6 -$(PKG)_WEBSITE := http://www.vtk.org/ -$(PKG)_DESCR := VTK6 -$(PKG)_IGNORE := -$(PKG)_VERSION := 6.3.0 -$(PKG)_CHECKSUM := 92a493354c5fa66bea73b5fc014154af5d9f3f6cee8d20a826f4cd5d4b0e8a5e -$(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 - -define $(PKG)_UPDATE - $(WGET) -q -O- 'http://vtk.org/gitweb?p=VTK.git;a=tags' | \ - grep 'refs/tags/v[0-9.]*"' | \ - $(SED) 's,.*refs/tags/v\(.*\)".*,\1,g;' | \ - grep -v rc | \ - $(SORT) -V | \ - tail -1 -endef - -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 \ - -DCMAKE_BUILD_TYPE="Release" \ - '$(1)' - $(MAKE) -C '$(1).native_build' -j '$(JOBS)' VERBOSE=1 vtkCompileTools - - # DirectX is detected on Mac OSX but we use OpenGL - $(SED) -i 's,d3d9,nod3d9,g' '$(1)/CMake/FindDirectX.cmake' - - # now the cross compilation - mkdir '$(1).cross_build' - cd '$(1).cross_build' && '$(TARGET)-cmake' \ - -C '$(1)/TryRunResults.cmake' \ - -DVTKCompileTools_DIR='$(1).native_build' \ - -DModule_vtkGUISupportQt=TRUE \ - -DModule_vtkGUISupportQtOpenGL=TRUE \ - -DModule_vtkViewsQt=TRUE \ - -DModule_vtkRenderingQt=TRUE \ - -DQT_QMAKE_EXECUTABLE=$(PREFIX)/$(TARGET)/qt/bin/qmake \ - -DVTK_USE_SYSTEM_HDF5=TRUE \ - -DBUILD_EXAMPLES=OFF \ - -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DBUILD_TESTING=FALSE \ - '$(1)' - $(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 - - #now build the GUI -> Qt -> SimpleView Example - mkdir '$(1).test' - cd '$(1).test' && '$(TARGET)-cmake' \ - '$(1)/Examples/GUI/Qt/SimpleView' - $(MAKE) -C '$(1).test' -j '$(JOBS)' VERBOSE=1 -endef -- cgit v0.12