Patched 5.8.0 source tree

CMake/ParaViewOptions.cmake

@@ -99,7 +99,7 @@ option(PARAVIEW_USE_MPI "Enable MPI support for parallel computing" OFF)
 option(PARAVIEW_USE_CUDA "Support CUDA compilation" OFF)
 option(PARAVIEW_USE_VTKM "Enable VTK-m accelerated algorithms" "${PARAVIEW_ENABLE_NONESSENTIAL}")
 
-vtk_deprecated_setting(python_default PARAVIEW_USE_PYTHON PARAVIEW_ENABLE_PYTHON OFF)
+vtk_deprecated_setting(python_default PARAVIEW_USE_PYTHON PARAVIEW_ENABLE_PYTHON ON)
 option(PARAVIEW_USE_PYTHON "Enable/Disable Python scripting support" "${python_default}")
 
 # Currently, we're making `PARAVIEW_USE_QT` available only when doing CANONICAL

CMakeLists.txt

@@ -52,8 +52,8 @@ endif ()
 get_property(generator_is_multi_config GLOBAL
   PROPERTY GENERATOR_IS_MULTI_CONFIG)
 if (NOT CMAKE_BUILD_TYPE AND NOT generator_is_multi_config)
-  message(STATUS "Setting build type to 'Debug' as none was specified.")
-  set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE)
+  message(STATUS "Setting build type to 'Release' as none was specified.")
+  set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
   # Set the possible values of build type for cmake-gui
   set_property(CACHE CMAKE_BUILD_TYPE
     PROPERTY
@@ -789,3 +789,35 @@ install(
 if (PARAVIEW_BUILD_EXAMPLES)
   add_subdirectory(Examples)
 endif ()
+
+#-----------------------------------------------------------------------------
+# Install TTK example data
+install(FILES ${ParaView_SOURCE_DIR}/TTK/Data/Example1.vti
+  DESTINATION share/paraview-5.8/examples/
+  COMPONENT development)
+
+install(FILES ${ParaView_SOURCE_DIR}/TTK/Data/Example2.vti
+  DESTINATION share/paraview-5.8/examples/
+  COMPONENT development)
+
+install(FILES ${ParaView_SOURCE_DIR}/TTK/Data/Example3.vti
+  DESTINATION share/paraview-5.8/examples/
+  COMPONENT development)
+
+#-----------------------------------------------------------------------------
+# Generate a .deb package
+set(CPACK_PACKAGE_NAME "TTK-ParaView")
+set(CPACK_PACKAGE_FILE_NAME "ttk-paraview")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ParaView built with TTK patches")
+set(CPACK_PACKAGE_CONTACT "Julien Tierny <[email protected]>")
+set(CPACK_PACKAGE_VENDOR "LIP6 - Sorbonne Université")
+set(CPACK_PACKAGE_HOMEPAGE_URL "https://topology-tool-kit.github.io/")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS
+  "qt5-default, qttools5-dev, libqt5x11extras5-dev, qtxmlpatterns5-dev-tools, libqt5svg5-dev, libxt-dev"
+  )
+set(CPACK_PACKAGE_VERSION_MAJOR ${PARAVIEW_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${PARAVIEW_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${PARAVIEW_VERSION_PATCH})
+# autogenerate dependency information
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+include(CPack)

Clients/ParaView/CMakeLists.txt

@@ -16,9 +16,9 @@ if (PARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION)
 endif ()
 
 if (DEFINED PARAVIEW_VERSION_NICKNAME)
-  set(paraview_version "${PARAVIEW_VERSION_NICKNAME}")
+  set(paraview_version "[TTK 0.9.9] ${PARAVIEW_VERSION_NICKNAME}")
 else ()
-  set(paraview_version "${PARAVIEW_VERSION_FULL}")
+  set(paraview_version "[TTK 0.9.9] ${PARAVIEW_VERSION_FULL}")
 endif ()
 set(paraview_title "")
 
@@ -62,7 +62,7 @@ paraview_client_add(
   EXPORT            "ParaViewClient"
   APPLICATION_NAME  "ParaView"
   TITLE             "ParaView ${paraview_version}"
-  ORGANIZATION      "ParaView"
+  ORGANIZATION      "TTK"
   VERSION           "${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}.${PARAVIEW_VERSION_PATCH}"
   ${style_args}
   MAIN_WINDOW_CLASS "ParaViewMainWindow"

Clients/ParaView/CMakeLists.txt.orig

@@ -0,0 +1,155 @@
+cmake_dependent_option(PARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION
+  "Build the ParaView help menu documentation for ParaView and its plugins" ON
+  "PARAVIEW_USE_QT" ON)
+mark_as_advanced(PARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION)
+
+set(xmls
+  "${CMAKE_CURRENT_SOURCE_DIR}/ParaViewFilters.xml"
+  "${CMAKE_CURRENT_SOURCE_DIR}/ParaViewSources.xml")
+
+if (PARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION)
+  #------------------------------------------------------------------------------
+  # Build Online-Help (aka Embedded Help) for the ParaView application.
+  # This is done after the above piece of code that sets the application_gui_xmls
+  # variable. Documentation/CMakeLists.txt depends on it.
+  add_subdirectory(Documentation)
+endif ()
+
+if (DEFINED PARAVIEW_VERSION_NICKNAME)
+  set(paraview_version "${PARAVIEW_VERSION_NICKNAME}")
+else ()
+  set(paraview_version "${PARAVIEW_VERSION_FULL}")
+endif ()
+set(paraview_title "")
+
+set(CMAKE_AUTOMOC 1)
+set(CMAKE_AUTOUIC 1)
+
+set(sources
+  ParaViewMainWindow.cxx
+  ParaViewMainWindow.h
+  ParaViewMainWindow.ui)
+
+find_package(Qt5 REQUIRED QUIET COMPONENTS Core Widgets)
+
+if (APPLE)
+  # Enable high resolution when using Qt5
+  # This configuring of MacOSXBundleInfo may no longer be needed, but I am
+  # leaving it in since in future we could build the supported extensions list
+  # more exhaustively here.
+  set(high_resolution_capable "true")
+  configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/MacOSXBundleInfo.plist.in"
+    @ONLY)
+  unset(high_resolution_capable)
+endif ()
+
+set(default_style)
+if (WIN32)
+  set(default_style "fusion")
+endif ()
+
+set(style_args)
+if (default_style)
+  list(APPEND style_args
+    DEFAULT_STYLE "${default_style}")
+endif ()
+
+paraview_client_add(
+  NAME              paraview
+  NAMESPACE         "ParaView"
+  EXPORT            "ParaViewClient"
+  APPLICATION_NAME  "ParaView"
+  TITLE             "ParaView ${paraview_version}"
+  ORGANIZATION      "ParaView"
+  VERSION           "${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}.${PARAVIEW_VERSION_PATCH}"
+  ${style_args}
+  MAIN_WINDOW_CLASS "ParaViewMainWindow"
+  BUNDLE_ICON       "${CMAKE_CURRENT_SOURCE_DIR}/pvIcon.icns"
+  BUNDLE_PLIST      "${CMAKE_CURRENT_BINARY_DIR}/MacOSXBundleInfo.plist.in"
+  APPLICATION_ICON  "${CMAKE_CURRENT_SOURCE_DIR}/pvIcon.ico"
+  SOURCES           ${sources}
+  PLUGINS_TARGETS   ParaView::paraview_plugins
+  APPLICATION_XMLS  ${xmls})
+
+find_package(Qt5 REQUIRED QUIET COMPONENTS Widgets)
+
+target_link_libraries(paraview
+  PRIVATE
+    ParaView::RemotingSettings
+    Qt5::Core
+    Qt5::Widgets)
+
+if (PARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION)
+  target_compile_definitions(paraview
+    PRIVATE
+      PARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION)
+  target_link_libraries(paraview
+    PRIVATE
+      vtkParaViewDocumentation)
+endif ()
+
+if (PARAVIEW_USE_PYTHON)
+  target_compile_definitions(paraview
+    PRIVATE
+      PARAVIEW_USE_PYTHON)
+  target_link_libraries(paraview
+    PRIVATE
+      ParaView::pvpythonmodules
+      ParaView::pqPython
+      ParaView::PythonInitializer)
+endif ()
+
+if (PARAVIEW_INSTALL_DEVELOPMENT_FILES)
+  export(
+    EXPORT    ParaViewClient
+    NAMESPACE ParaView::
+    FILE      "${CMAKE_BINARY_DIR}/${paraview_cmake_destination}/ParaViewClient-targets.cmake")
+  install(
+    EXPORT      ParaViewClient
+    NAMESPACE   ParaView::
+    FILE        ParaViewClient-targets.cmake
+    DESTINATION "${paraview_cmake_destination}"
+    COMPONENT   "development")
+endif ()
+
+if (BUILD_TESTING)
+  add_subdirectory(Testing)
+endif ()
+
+if (UNIX AND NOT APPLE)
+  configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/org.paraview.ParaView.desktop.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/org.paraview.ParaView.desktop"
+    @ONLY)
+  install(
+    FILES       "${CMAKE_CURRENT_BINARY_DIR}/org.paraview.ParaView.desktop"
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications"
+    COMPONENT   runtime)
+  foreach (iconsize IN ITEMS 22x22 32x32 96x96)
+    install(
+      FILES       "pvIcon-${iconsize}.png"
+      DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${iconsize}/apps"
+      RENAME      paraview.png
+      COMPONENT   runtime)
+  endforeach ()
+  install(
+    FILES       org.paraview.ParaView.appdata.xml
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo"
+    COMPONENT   runtime)
+endif ()
+
+set(paraview_xml_destination
+  "${CMAKE_INSTALL_DATAROOTDIR}/paraview${paraview_version_suffix}/xmls")
+install(
+  FILES       ${xmls}
+  DESTINATION "${paraview_xml_destination}"
+  COMPONENT   "development")
+
+set_property(GLOBAL APPEND
+  PROPERTY
+    paraview_client_xml_files "${xmls}")
+set_property(GLOBAL
+  PROPERTY
+    paraview_client_xml_destination "${paraview_xml_destination}")