Commit 05928ba1 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit
Browse files

remove catalyst

Catalyst editions no longer exist with 5.8. Remove them.
parent ed9845ff
......@@ -110,7 +110,6 @@ function (superbuild_find_projects var)
if (NOT APPLE)
list(APPEND projects
catalyst
egl
expat
fontconfig
......@@ -200,10 +199,6 @@ function (superbuild_sanity_check)
message(SEND_ERROR "Cannot enable OSMesa and Mesa at the same time.")
endif ()
# Sanity check: Cannot have ParaView and Catalyst enabled at the same time.
if (paraview_enabled AND catalyst_enabled)
message(SEND_ERROR "Cannot enable ParaView and Catalyst at the same time.")
endif ()
endfunction ()
function (superbuild_add_packaging)
......@@ -285,14 +280,6 @@ function (superbuild_add_packaging)
LABELS "ParaView"
TIMEOUT 6400)
endif ()
if (catalyst_enabled OR (paraview_enabled AND UNIX AND NOT APPLE))
if (NOT default_package)
set(default_package catalyst)
endif ()
superbuild_add_extra_package_test(catalyst "${generator}"
LABELS "ParaView"
TIMEOUT 6400)
endif ()
endforeach ()
if (paraviewsdk_enabled)
......
......@@ -103,9 +103,7 @@ different features within the resulting ParaView build. Most projects involve
downloading and adding the feature to the resulting package, but there are a
few which are used just to enable features within ParaView itself.
The `catalyst` and `paraview` projects are mutually exclusive (the libraries
conflict in the install tree). One of these two projects must be enabled.
The `catalyst` package is only available on Linux.
The `paraview` project must be enabled to build ParaView.
The `paraviewsdk` project enables the building of a package which includes
headers and libraries suitable for developing against ParaView. It is only available
......@@ -174,8 +172,6 @@ include:
* `paraview/DragNDrop`
* `paraview/TGZ`
* `paraview/TXZ`
* `catalyst/TGZ`
* `catalyst/TXZ`
* `paraviewsdk/TGZ`
* `paraviewsdk/TXZ`
......@@ -301,13 +297,6 @@ The following flags affect ParaView directly:
pass to ParaView's configure step. This can be used to set CMake variables
for the build that are otherwise not exposed in the superbuild itself.
The following flags affect Catalyst:
* `PARAVIEW_CATALYST_EDITION` (default `Essentials`): The edition of
Catalyst to build (also available: `Extras` and `Rendering-Base`).
* `PARAVIEW_CATALYST_PYTHON` (default `ON`): Enable Python support in
Catalyst.
### Packaging Variables
* `PARAVIEW_PACKAGE_SUFFIX` (default based on selected options): The suffix
......
include(paraview-version)
set(paraview_doc_dir "share/paraview-${paraview_version}/doc")
set(paraview_data_dir "share/paraview-${paraview_version}/examples")
set(paraview_plugin_path "lib/paraview-${paraview_version}/plugins")
set(CPACK_PACKAGE_NAME "ParaView-Catalyst-${PARAVIEW_CATALYST_EDITION}")
include(paraview.bundle.common)
# Enable CPack packaging.
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
"ParaView Catalyst ${PARAVIEW_CATALYST_EDITION} for in-situ visualization")
install(
DIRECTORY "${superbuild_install_location}/include/paraview-${paraview_version}"
DESTINATION "include"
USE_SOURCE_PERMISSIONS
COMPONENT "catalyst")
install(
DIRECTORY "${superbuild_install_location}/lib/cmake/paraview-${paraview_version}"
DESTINATION "lib/cmake"
USE_SOURCE_PERMISSIONS
COMPONENT "catalyst")
# Disable paraview-config that doesn't appear to be used anywhere
# TODO - package paraview-config
#list(APPEND paraview_executables
# paraview-config)
# Catalyst never has paraview.
list(REMOVE_ITEM paraview_executables
paraview)
set(paraview_component "catalyst")
include(paraview.bundle.unix)
set(PARAVIEW_CATALYST_EDITION "Essentials"
CACHE STRING "The catalyst edition to build")
set_property(CACHE PARAVIEW_CATALYST_EDITION
PROPERTY
STRINGS Essentials Extras Rendering-Base)
option(PARAVIEW_CATALYST_PYTHON "Enable Python support in catalyst" ON)
set(catalyst_editions Base)
if (PARAVIEW_CATALYST_PYTHON)
list(APPEND catalyst_editions
Enable-Python)
endif ()
if (PARAVIEW_CATALYST_EDITION STREQUAL "Essentials")
list(APPEND catalyst_editions
Essentials)
elseif (PARAVIEW_CATALYST_EDITION STREQUAL "Extras")
list(APPEND catalyst_editions
Essentials
Extras)
elseif (PARAVIEW_CATALYST_EDITION STREQUAL "Rendering-Base")
list(APPEND catalyst_editions
Essentials
Extras
Rendering-Base)
if (PARAVIEW_CATALYST_PYTHON)
list(APPEND catalyst_editions
Rendering-Base-Python)
endif ()
elseif (catalyst_enabled)
message(FATAL_ERROR "Unknown catalyst edition set: ${PARAVIEW_CATALYST_EDITION}")
endif ()
set(catalyst_edition_args)
foreach (catalyst_edition IN LISTS catalyst_editions)
list(APPEND catalyst_edition_args
-i <SOURCE_DIR>/Catalyst/Editions/${catalyst_edition})
endforeach ()
set(catalyst_cmake_args
-G "${CMAKE_GENERATOR}"
-DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=TRUE
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-DCMAKE_PREFIX_PATH:PATH=<INSTALL_DIR>
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DCMAKE_C_FLAGS:STRING=${project_c_flags}
-DCMAKE_CXX_FLAGS:STRING=${project_cxx_flags}
-DCMAKE_SHARED_LINKER_FLAGS:STRING=${project_ld_flags})
superbuild_add_project(catalyst
DEPENDS mpi python
CONFIGURE_COMMAND
${pv_python_executable} <SOURCE_DIR>/Catalyst/catalyze.py
${catalyst_edition_args}
-r <SOURCE_DIR>
-o <TMP_DIR>/catalyzed
BUILD_COMMAND
<TMP_DIR>/catalyzed/cmake.sh
--cmake=${CMAKE_COMMAND}
${catalyst_cmake_args}
<TMP_DIR>/catalyzed
INSTALL_COMMAND
${CMAKE_COMMAND}
--build <BINARY_DIR>
--target install
-- -j${SUPERBUILD_PROJECT_PARALLELISM})
......@@ -49,11 +49,6 @@ superbuild_set_selectable_source(paraview
GIT_TAG "origin/master"
SELECT source CUSTOMIZABLE
SOURCE_DIR "source-paraview")
get_property(paraview_revision GLOBAL
PROPERTY paraview_revision)
superbuild_set_revision(catalyst
${paraview_revision})
unset(paraview_revision)
superbuild_set_revision(vrpn
# https://github.com/vrpn/vrpn.git
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment