From 74e99c5ce98b85bd61c0881fae2d9ecc2861ac9d Mon Sep 17 00:00:00 2001 From: Brian Panneton Date: Wed, 20 Jul 2011 10:45:43 -0400 Subject: [PATCH] Added support to build ParaView without Xdmf support. CMake option is PARAVIEW_BUILD_Xdmf. The default for the option is 'ON'. By turning off, Xdmf will not be built into ParaView. Change-Id: I17733e553033b5cc1382b27444022f9c63cf6b99 --- Applications/ParaView/Testing/XML/CMakeLists.txt | 39 +++++++----- CMake/ParaViewCommon.cmake | 64 ++++++++++---------- CMakeLists.txt | 7 ++- .../ServerManager/Testing/Cxx/CMakeLists.txt | 4 +- .../ServerManager/vtkInitializationHelper.cxx | 6 ++ ParaViewCore/VTKExtensions/CMakeLists.txt | 9 ++- SuperBuild/CMakeLists.txt | 7 ++ Utilities/Doxygen/CMakeLists.txt | 16 ++++- Utilities/VTKClientServer/CMakeLists.txt | 4 +- 9 files changed, 101 insertions(+), 55 deletions(-) diff --git a/Applications/ParaView/Testing/XML/CMakeLists.txt b/Applications/ParaView/Testing/XML/CMakeLists.txt index 30446d1..5e335ea 100644 --- a/Applications/ParaView/Testing/XML/CMakeLists.txt +++ b/Applications/ParaView/Testing/XML/CMakeLists.txt @@ -102,25 +102,32 @@ SET (TESTS_WITH_BASELINES ${CMAKE_CURRENT_SOURCE_DIR}/VariableSelector.xml ${CMAKE_CURRENT_SOURCE_DIR}/VariableSelector1.xml ${CMAKE_CURRENT_SOURCE_DIR}/ViewSettingsDialog.xml - ${CMAKE_CURRENT_SOURCE_DIR}/XdmfRead.xml - ${CMAKE_CURRENT_SOURCE_DIR}/XdmfReadImageData.xml - ${CMAKE_CURRENT_SOURCE_DIR}/XdmfReadImageDataCollection.xml - ${CMAKE_CURRENT_SOURCE_DIR}/XdmfReadRectilinearGrid.xml - ${CMAKE_CURRENT_SOURCE_DIR}/XdmfReadRectilinearGridCollection.xml - ${CMAKE_CURRENT_SOURCE_DIR}/XdmfReadStructuredGrid.xml - ${CMAKE_CURRENT_SOURCE_DIR}/XdmfReadStructuredGridCollection.xml - ${CMAKE_CURRENT_SOURCE_DIR}/XdmfGridAttributes.xml ${CMAKE_CURRENT_SOURCE_DIR}/XYChart.xml ${CMAKE_CURRENT_SOURCE_DIR}/XYHistogram.xml ${CMAKE_CURRENT_SOURCE_DIR}/ZLibXDMF.xml # ${CMAKE_CURRENT_SOURCE_DIR}/XYBarChart.xml ) + IF(PARAVIEW_BUILD_Xdmf) + SET(TEST_WITH_BASELINES + ${TEST_WITH_BASELINES} + ${CMAKE_CURRENT_SOURCE_DIR}/XdmfRead.xml + ${CMAKE_CURRENT_SOURCE_DIR}/XdmfReadImageData.xml + ${CMAKE_CURRENT_SOURCE_DIR}/XdmfReadImageDataCollection.xml + ${CMAKE_CURRENT_SOURCE_DIR}/XdmfReadRectilinearGrid.xml + ${CMAKE_CURRENT_SOURCE_DIR}/XdmfReadRectilinearGridCollection.xml + ${CMAKE_CURRENT_SOURCE_DIR}/XdmfReadStructuredGrid.xml + ${CMAKE_CURRENT_SOURCE_DIR}/XdmfReadStructuredGridCollection.xml + ${CMAKE_CURRENT_SOURCE_DIR}/XdmfGridAttributes.xml + ) + ENDIF(PARAVIEW_BUILD_Xdmf) # Mark tests that change change state considerably requires a restart of the # test suite when grouping tests together for faster playback. SET (GlobalProperties_BREAK TRUE) # <-- since this changes global colors. -SET (XdmfReadImageData_BREAK TRUE) +IF(PARAVIEW_BUILD_Xdmf) + SET (XdmfReadImageData_BREAK TRUE) +ENDIF(PARAVIEW_BUILD_Xdmf) # <-- since this changes light kit. SET (UndoRedo3_BREAK TRUE) SET (UndoRedo6_BREAK TRUE) @@ -185,12 +192,14 @@ SET (Clip_DISABLE_CRS TRUE) # These Xdmf tests have wireframes, hence the increased thresholds. -SET (XdmfReadImageData_THRESHOLD 20) -SET (XdmfReadRectilinearGrid_THRESHOLD 20) -SET (XdmfReadRectilinearGridCollection_THRESHOLD 20) -SET (XdmfReadStructuredGrid_THRESHOLD 20) -SET (XdmfReadStructuredGridCollection_THRESHOLD 20) -SET (XdmfReadImageDataCollection_THRESHOLD 20) +IF(PARAVIEW_BUILD_Xdmf) + SET (XdmfReadImageData_THRESHOLD 20) + SET (XdmfReadRectilinearGrid_THRESHOLD 20) + SET (XdmfReadRectilinearGridCollection_THRESHOLD 20) + SET (XdmfReadStructuredGrid_THRESHOLD 20) + SET (XdmfReadStructuredGridCollection_THRESHOLD 20) + SET (XdmfReadImageDataCollection_THRESHOLD 20) +ENDIF(PARAVIEW_BUILD_Xdmf) # This test renders points and they are offsetted a bit differently on # different platforms so just increase the threshold diff --git a/CMake/ParaViewCommon.cmake b/CMake/ParaViewCommon.cmake index 3f072ee..1f4fa9e 100644 --- a/CMake/ParaViewCommon.cmake +++ b/CMake/ParaViewCommon.cmake @@ -220,12 +220,14 @@ SET(KWCommon_INSTALL_NO_RUNTIME ${PV_INSTALL_NO_RUNTIME}) SET(KWCommon_INSTALL_NO_DOCUMENTATION 1) # XDMF config -SET(XDMF_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR}) -SET(XDMF_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR}) -SET(XDMF_INSTALL_INCLUDE_DIR "${PV_INSTALL_INCLUDE_DIR}/Xdmf") -SET(XDMF_INSTALL_INCLUDE_VTK_DIR "${PV_INSTALL_INCLUDE_DIR}/Xdmf") -SET(XDMF_INSTALL_EXPORT_NAME ${PV_INSTALL_EXPORT_NAME}) -SET(XDMF_WRAP_PYTHON_INSTALL_DIR ${PV_INSTALL_LIB_DIR}/site-packages/Xdmf) +IF(PARAVIEW_BUILD_Xdmf) + SET(XDMF_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR}) + SET(XDMF_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR}) + SET(XDMF_INSTALL_INCLUDE_DIR "${PV_INSTALL_INCLUDE_DIR}/Xdmf") + SET(XDMF_INSTALL_INCLUDE_VTK_DIR "${PV_INSTALL_INCLUDE_DIR}/Xdmf") + SET(XDMF_INSTALL_EXPORT_NAME ${PV_INSTALL_EXPORT_NAME}) + SET(XDMF_WRAP_PYTHON_INSTALL_DIR ${PV_INSTALL_LIB_DIR}/site-packages/Xdmf) +ENDIF(PARAVIEW_BUILD_Xdmf) ######################################################################### # The client server wrapper macro needs this name for @@ -482,33 +484,33 @@ ENDIF(PARAVIEW_ENABLE_PYTHON AND PARAVIEW_USE_MPI) ######################################################################### # Configure Xdmf +IF(PARAVIEW_BUILD_Xdmf) + SET(XDMF_INSTALL_NO_DEVELOPMENT ${PV_INSTALL_NO_DEVELOPMENT}) + SET(XDMF_INSTALL_NO_RUNTIME ${PV_INSTALL_NO_RUNTIME}) + SET(XDMF_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR}) + SET(XDMF_REGENERATE_YACCLEX OFF CACHE INTERNAL "" FORCE) + SET(XDMF_REGENERATE_WRAPPERS OFF CACHE INTERNAL "" FORCE) + # Xdmf needs packaging fixes for this to be enabled. + SET(XDMF_WRAP_PYTHON OFF CACHE INTERNAL "" FORCE) + MARK_AS_ADVANCED(FORCE XDMF_WRAP_PYTHON XDMF_WRAP_CSHARP) + MARK_AS_ADVANCED(XDMF_REGENERATE_WRAPPERS XDMF_REGENERATE_YACCLEX) + + SET(XDMF_WRAP_TCL OFF CACHE INTERNAL "" FORCE) + SET(XDMF_KITS_DIR "${ParaView_BINARY_DIR}/Utilities/Xdmf2/vtk/Utilities") + SET(XDMF_INCLUDE_DIRS + "${ParaView_SOURCE_DIR}/Utilities/Xdmf2/vtk" + "${ParaView_BINARY_DIR}/Utilities/Xdmf2/vtk") + SET(PARAVIEW_LINK_XDMF ON) -SET(XDMF_INSTALL_NO_DEVELOPMENT ${PV_INSTALL_NO_DEVELOPMENT}) -SET(XDMF_INSTALL_NO_RUNTIME ${PV_INSTALL_NO_RUNTIME}) -SET(XDMF_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR}) -SET(XDMF_REGENERATE_YACCLEX OFF CACHE INTERNAL "" FORCE) -SET(XDMF_REGENERATE_WRAPPERS OFF CACHE INTERNAL "" FORCE) -# Xdmf needs packaging fixes for this to be enabled. -SET(XDMF_WRAP_PYTHON OFF CACHE INTERNAL "" FORCE) -MARK_AS_ADVANCED(FORCE XDMF_WRAP_PYTHON XDMF_WRAP_CSHARP) -MARK_AS_ADVANCED(XDMF_REGENERATE_WRAPPERS XDMF_REGENERATE_YACCLEX) - -SET(XDMF_WRAP_TCL OFF CACHE INTERNAL "" FORCE) -SET(XDMF_KITS_DIR "${ParaView_BINARY_DIR}/Utilities/Xdmf2/vtk/Utilities") -SET(XDMF_INCLUDE_DIRS - "${ParaView_SOURCE_DIR}/Utilities/Xdmf2/vtk" - "${ParaView_BINARY_DIR}/Utilities/Xdmf2/vtk") -SET(PARAVIEW_LINK_XDMF ON) - -IF (NOT PV_INSTALL_NO_LIBRARIES) - SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS Xdmf) -ENDIF (NOT PV_INSTALL_NO_LIBRARIES) -IF(XDMF_WRAP_PYTHON) - SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS _Xdmf) -Endif() - -ADD_SUBDIRECTORY(Utilities/Xdmf2) + IF (NOT PV_INSTALL_NO_LIBRARIES) + SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS Xdmf) + ENDIF (NOT PV_INSTALL_NO_LIBRARIES) + IF(XDMF_WRAP_PYTHON) + SET_PROPERTY(GLOBAL APPEND PROPERTY VTK_TARGETS _Xdmf) + Endif() + ADD_SUBDIRECTORY(Utilities/Xdmf2) +ENDIF(PARAVIEW_BUILD_Xdmf) ######################################################################### # Configure protobuf SET (PROTOBUF_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR}) diff --git a/CMakeLists.txt b/CMakeLists.txt index 111c10d..2505a47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,7 +113,12 @@ MARK_AS_ADVANCED(QT_QTMOTIF_INCLUDE_DIR QT_QTMOTIF_LIBRARY_DEBUG QT_QTMOTIF_LIBR IF (APPLE) MARK_AS_ADVANCED(CMAKE_OSX_ARCHITECTURES CMAKE_OSX_SYSROOT VTK_USE_CARBON VTK_USE_COCOA VTK_APPLE_RESOURCE) ENDIF(APPLE) -MARK_AS_ADVANCED(VTK_USE_MPEG2_ENCODER QT_PLUGINS_DIR QT_MKSPECS_DIR VTK_USE_MFC XDMF_BUILD_UTILS XDMF_USE_BZIP2 XDMF_USE_GZIP QT_QTDESIGNER_INCLUDE_DIR) +MARK_AS_ADVANCED(VTK_USE_MPEG2_ENCODER QT_PLUGINS_DIR QT_MKSPECS_DIR VTK_USE_MFC QT_QTDESIGNER_INCLUDE_DIR) + +# Build with Xdmf Support +SET(PARAVIEW_BUILD_Xdmf ON CACHE BOOL "Build ParaView with Xdmf Support") +MARK_AS_ADVANCED(PARAVIEW_BUILD_Xdmf XDMF_BUILD_UTILS XDMF_USE_BZIP2 +XDMF_USE_GZIP) ######################################################################### # Define a PARAVIEW_USE_MPI that is not advanced diff --git a/ParaViewCore/ServerManager/Testing/Cxx/CMakeLists.txt b/ParaViewCore/ServerManager/Testing/Cxx/CMakeLists.txt index f4706ef..65772b0 100644 --- a/ParaViewCore/ServerManager/Testing/Cxx/CMakeLists.txt +++ b/ParaViewCore/ServerManager/Testing/Cxx/CMakeLists.txt @@ -2,10 +2,12 @@ INCLUDE_DIRECTORIES( ${ParaView_BINARY_DIR} ${VTKCLIENTSERVER_INCLUDE_DIR} ${VTK_INCLUDE_DIR} - ${XDMF_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${protobuf_SOURCE_DIR}/src ) +IF(PARAVIEW_BUILD_Xdmf) + INCLUDE_DIRECTORIES(${XDMF_INCLUDE_DIRS}) +ENDIF(PARAVIEW_BUILD_Xdmf) ADD_EXECUTABLE(TestSubProxy TestSubProxy.cxx) diff --git a/ParaViewCore/ServerManager/vtkInitializationHelper.cxx b/ParaViewCore/ServerManager/vtkInitializationHelper.cxx index e47b3da..f1843e1 100644 --- a/ParaViewCore/ServerManager/vtkInitializationHelper.cxx +++ b/ParaViewCore/ServerManager/vtkInitializationHelper.cxx @@ -72,7 +72,10 @@ extern "C" void vtkPVVTKExtensionsCS_Initialize(vtkClientServerInterpreter*); extern "C" void vtkPVClientServerCoreCS_Initialize(vtkClientServerInterpreter*); extern "C" void vtkPVServerImplementationCS_Initialize(vtkClientServerInterpreter*); extern "C" void vtkPVServerManager_Initialize(vtkClientServerInterpreter*); + +#ifdef PARAVIEW_BUILD_Xdmf extern "C" void vtkXdmfCS_Initialize(vtkClientServerInterpreter *); +#endif #ifdef PARAVIEW_USE_VISITBRIDGE extern "C" void vtkVisItAVTAlgorithmsCS_Initialize(vtkClientServerInterpreter *); @@ -215,7 +218,10 @@ void vtkInitializationHelperInit(vtkClientServerInterpreter* interp) vtkPVClientServerCoreCS_Initialize(interp); vtkPVServerImplementationCS_Initialize(interp); vtkPVServerManager_Initialize(interp); + +# ifdef PARAVIEW_BUILD_Xdmf vtkXdmfCS_Initialize(interp); +# endif # ifdef PARAVIEW_USE_VISITBRIDGE vtkVisItAVTAlgorithmsCS_Initialize(interp); diff --git a/ParaViewCore/VTKExtensions/CMakeLists.txt b/ParaViewCore/VTKExtensions/CMakeLists.txt index e0a67dc..05dfeab 100644 --- a/ParaViewCore/VTKExtensions/CMakeLists.txt +++ b/ParaViewCore/VTKExtensions/CMakeLists.txt @@ -293,8 +293,10 @@ INCLUDE_DIRECTORIES( ${VTK_INCLUDE_DIR} ${HDF5_INCLUDE_DIR} ${SPCTH_INCLUDE_DIR} - ${XDMF_INCLUDE_DIRS} ) +IF(PARAVIEW_BUILD_Xdmf) + INCLUDE_DIRECTORIES(${XDMF_INCLUDE_DIRS}) +ENDIF(PARAVIEW_BUILD_Xdmf) # The following was copy/paste from vtkIncludeDirectories.cmake # OpenGL include directories. @@ -390,7 +392,6 @@ VTK_ADD_LIBRARY(vtk${KIT} TARGET_LINK_LIBRARIES(vtk${KIT} vtkPVCommon vtkPVCommonCS - vtkXdmfCS vtkHybridCS vtkParallelCS vtkVolumeRenderingCS @@ -407,6 +408,10 @@ TARGET_LINK_LIBRARIES(vtk${KIT} ${OPENGL_gl_LIBRARY} ${PARAVIEW_ADDITIONAL_LIBRARIES} ) +IF(PARAVIEW_BUILD_Xdmf) + TARGET_LINK_LIBRARIES(vtk${KIT} vtkXdmfCS) +ENDIF(PARAVIEW_BUILD_Xdmf) + IF (VTK_USE_QVTK) TARGET_LINK_LIBRARIES(vtk${KIT} QVTK) ENDIF (VTK_USE_QVTK) diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt index a89993e..bd4d1b0 100644 --- a/SuperBuild/CMakeLists.txt +++ b/SuperBuild/CMakeLists.txt @@ -326,6 +326,11 @@ set(VRPN_ARGS -DVRPN_LIBRARY:FILE_PATH=${VRPN_LIBRARY} -DVRPN_INCLUDE_DIR:PATH=${VRPN_INCLUDE_DIR}) +# Build Xdmf +if(PARAVIEW_BUILD_Xdmf) + set(XDMF_ARGS -DPARAVIEW_BUILD_Xdmf:BOOL=ON) +endif(PARAVIEW_BUILD_Xdmf) + if(WIN32) list(APPEND PARAVIEW_FIXUP_BUNDLE_SEARCH_PATHS ${VRPN_install}/lib) else() @@ -411,6 +416,8 @@ ExternalProject_Add(${proj} ${VISTRAILS_ARGS} # VRPN Plugin ${VRPN_ARGS} + # Xdmf + ${XDMF_ARGS} # zlib ${ZLIB_ARGS} # Documentation diff --git a/Utilities/Doxygen/CMakeLists.txt b/Utilities/Doxygen/CMakeLists.txt index 9d5df72..9a97648 100644 --- a/Utilities/Doxygen/CMakeLists.txt +++ b/Utilities/Doxygen/CMakeLists.txt @@ -18,8 +18,7 @@ IF (BUILD_DOCUMENTATION) SET(DOXYGEN_CVSWEB_CHECKOUT_SUFFIX "?cvsroot=ParaView3") SET(DOXYGEN_SOURCE_LOCATIONS_DIR "${ParaView_SOURCE_DIR}") SET(DOXYGEN_SOURCE_LOCATIONS - "\"${ParaView_SOURCE_DIR}/Utilities/Xdmf2/vtk\" \\ - \"${ParaView_SOURCE_DIR}/Utilities/VTKPythonWrapping/Executable\" \\ + "\"${ParaView_SOURCE_DIR}/Utilities/VTKPythonWrapping/Executable\" \\ \"${ParaView_SOURCE_DIR}/Utilities/VTKClientServer\" \\ \"${ParaView_SOURCE_DIR}/Qt/Core\" \\ \"${ParaView_SOURCE_DIR}/Common/KWCommon\" \\ @@ -28,12 +27,16 @@ IF (BUILD_DOCUMENTATION) \"${ParaView_SOURCE_DIR}/ParaViewCore/ServerImplementation\" \\ \"${ParaView_SOURCE_DIR}/ParaViewCore/ServerManager\" \\ \"${ParaView_SOURCE_DIR}/ParaViewCore/VTKExtensions\"") + IF(PARAVIEW_BUILD_Xdmf) + SET(DOXYGEN_SOURCE_LOCATIONS + "\"${ParaView_SOURCE_DIR}/Utilities/Xdmf2/vtk\" \\ + ${DOXYGEN_SOURCE_LOCATIONS}") + ENDIF(PARAVIEW_BUILD_Xdmf) SET(DOXYGEN_BINARY_LOCATIONS_DIR "${ParaView_BINARY_DIR}") SET(DOXYGEN_BINARY_LOCATIONS "") SET(DOXYGEN_PARSED_INPUT_DIRS - " \"${CMAKE_CURRENT_BINARY_DIR}/dox/Utilities/Xdmf2/vtk\" \\ - \"${CMAKE_CURRENT_BINARY_DIR}/dox/Utilities/VTKPythonWrapping/Executable\" \\ + " \"${CMAKE_CURRENT_BINARY_DIR}/dox/Utilities/VTKPythonWrapping/Executable\" \\ \"${CMAKE_CURRENT_BINARY_DIR}/dox/Qt/Core\" \\ \"${ParaView_SOURCE_DIR}/Qt/Core\" \\ \"${ParaView_SOURCE_DIR}/Qt/Components\" \\ @@ -49,6 +52,11 @@ IF (BUILD_DOCUMENTATION) \"${CMAKE_CURRENT_BINARY_DIR}/dox/ParaViewCore/ServerImplementation\" \\ \"${CMAKE_CURRENT_BINARY_DIR}/dox/ParaViewCore/ServerManager\" \\ \"${CMAKE_CURRENT_BINARY_DIR}/dox/ParaViewCore/VTKExtensions\"") + IF(PARAVIEW_BUILD_Xdmf) + SET(DOXYGEN_PARSED_INPUT_DIRS + " \"${CMAKE_CURRENT_BINARY_DIR}/dox/Utilities/Xdmf2/vtk\" \\ + "${DOXYGEN_PARSED_INPUT_DIRS}") + ENDIF(PARAVIEW_BUILD_Xdmf) SET(DOXYGEN_IGNORE_PREFIX "vtkPV vtkSM vtk pq vtkCP") diff --git a/Utilities/VTKClientServer/CMakeLists.txt b/Utilities/VTKClientServer/CMakeLists.txt index 729dcff..19d123c 100644 --- a/Utilities/VTKClientServer/CMakeLists.txt +++ b/Utilities/VTKClientServer/CMakeLists.txt @@ -117,7 +117,9 @@ ADD_SUBDIRECTORY(Widgets) # Build vtkClientServer wrappers for Xdmf if it is available. IF(PARAVIEW_SOURCE_DIR OR ParaView_SOURCE_DIR) - ADD_SUBDIRECTORY(Xdmf2) + IF(PARAVIEW_BUILD_Xdmf) + ADD_SUBDIRECTORY(Xdmf2) + ENDIF(PARAVIEW_BUILD_Xdmf) ENDIF(PARAVIEW_SOURCE_DIR OR ParaView_SOURCE_DIR) # Build vtkClientServer wrappers for Infovis if it is enabled -- 1.6.5.2