Commit 1d797523 authored by Chuck Atkins's avatar Chuck Atkins
Browse files

Remove ADIOS1 support

parent 3ed010dd
......@@ -94,14 +94,12 @@ function (superbuild_find_projects var)
if (UNIX)
list(APPEND projects
adios
cosmotools
ffmpeg
fortran
genericio
libxml2
mili
mxml
scipy)
if (NOT APPLE)
......
function (adios_add_config_option adios_opt project include_dir)
set(configure_option)
if (USE_SYSTEM_${project})
if (include_dir)
list(GET include_dir 0 include_dir)
get_filename_component(include_root "${include_dir}" DIRECTORY)
set(configure_option "--with-${adios_opt}=${include_root}")
else ()
set(configure_option "--with-${adios_opt}")
endif ()
else ()
set(configure_option "--with-${adios_opt}=<INSTALL_DIR>")
endif ()
set("${adios_opt}_option" ${configure_option} PARENT_SCOPE)
endfunction ()
set(adios_options)
adios_add_config_option(mxml mxml "${MXML_INCLUDE_DIR}")
list(APPEND adios_options ${mxml_option})
if (bzip2_enabled)
adios_add_config_option(bzip2 bzip2 "${BZIP2_INCLUDE_DIR}")
list(APPEND adios_options ${bzip2_option})
endif ()
if (zlib_enabled)
adios_add_config_option(zlib zlib "${ZLIB_INCLUDE_DIR}")
list(APPEND adios_options ${zlib_option})
endif ()
if (hdf5_enabled)
adios_add_config_option(hdf5 hdf5 "${HDF5_INCLUDE_DIRS}")
list(APPEND adios_options ${hdf5_option})
endif ()
if (netcdf_enabled)
adios_add_config_option(netcdf netcdf "${NETCDF_INCLUDE_DIR}")
list(APPEND adios_options ${netcdf_option})
endif ()
superbuild_add_project(adios
CAN_USE_SYSTEM
DEPENDS mpi mxml
DEPENDS_OPTIONAL bzip2 zlib hdf5 netcdf
BUILD_IN_SOURCE 1
PATCH_COMMAND
<SOURCE_DIR>/autogen.sh
CONFIGURE_COMMAND
<SOURCE_DIR>/configure
--prefix=<INSTALL_DIR>
--with-lustre
--disable-fortran
${adios_options}
PROCESS_ENVIRONMENT
CC "${CMAKE_C_COMPILER}"
CXX "${CMAKE_CXX_COMPILER}"
MPICC "${MPI_C_COMPILER}"
MPICXX "${MPI_CXX_COMPILER}")
superbuild_add_extra_cmake_args(
-DADIOS_CONFIG:FILEPATH=<INSTALL_DIR>/bin/adios_config)
find_program(ADIOS_CONFIG adios_config)
if (NOT ADIOS_CONFIG)
message(FATAL_ERROR "Unable to locate adios_config")
endif ()
superbuild_add_extra_cmake_args(
-DADIOS_CONFIG:FILEPATH=${ADIOS_CONFIG})
if (BUILD_SHARED_LIBS)
set(mxml_shared_flags --enable-shared)
else ()
set(mxml_shared_flags --disable-shared)
endif ()
superbuild_add_project(mxml
CAN_USE_SYSTEM
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND
<SOURCE_DIR>/configure
--prefix=<INSTALL_DIR>
${mxml_shared_args}
PROCESS_ENVIRONMENT
CC "${CMAKE_C_COMPILER}"
CXX "${CMAKE_CXX_COMPILER}")
find_path(MXML_INCLUDE_DIR mxml.h)
find_library(MXML_LIBRARY mxml)
if (NOT (MXML_INCLUDE_DIR AND MXML_LIBRARY))
message(FATAL_ERROR "Unable to locate mxml")
endif ()
......@@ -82,7 +82,7 @@ if (UNIX)
fontconfig)
endif ()
list(APPEND paraviews_platform_dependencies
adios ffmpeg libxml2 freetype mili
ffmpeg libxml2 freetype mili
# For cosmotools
genericio cosmotools)
......@@ -127,12 +127,6 @@ endif()
option(PARAVIEW_ENABLE_MOTIONFX "Enable MotionFX reader, if supported on platform" ON)
mark_as_advanced(PARAVIEW_ENABLE_MOTIONFX)
if(adios_enabled)
set(adios_module_flag "YES")
else()
set(adios_module_flag "NO")
endif()
set(paraview_use_raytracing OFF)
if (ospray_enabled OR visrtx_enabled)
set(paraview_use_raytracing ON)
......@@ -185,7 +179,6 @@ superbuild_add_project(paraview
-DVTK_MODULE_USE_EXTERNAL_VTK_png:BOOL=${png_enabled}
-DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=${zlib_enabled}
-DVTK_MODULE_USE_EXTERNAL_VTK_expat:BOOL=${expat_enabled}
-DVTK_MODULE_ENABLE_VTK_IOADIOS:BOOL=${adios_module_flag}
-DVTK_SMP_IMPLEMENTATION_TYPE:STRING=${paraview_smp_backend}
-DVTK_LEGACY_REMOVE:BOOL=ON
-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN:BOOL=${osmesa_enabled}
......
......@@ -16,14 +16,6 @@ superbuild_set_revision(mesa
get_property(mesa_revision GLOBAL PROPERTY mesa_revision)
superbuild_set_revision(osmesa ${mesa_revision})
superbuild_set_revision(adios
URL "https://www.paraview.org/files/dependencies/adios-1.11.0.tar.gz"
URL_MD5 5eead5b2ccf962f5e6d5f254d29d5238)
superbuild_set_revision(mxml
URL "https://www.paraview.org/files/dependencies/mxml-2.9.tar.gz"
URL_MD5 e21cad0f7aacd18f942aa0568a8dee19)
superbuild_set_revision(silo
URL "https://www.paraview.org/files/dependencies/silo-4.10.2-bsd-smalltest.tar.gz"
URL_MD5 d2a9023f63de361d91f94646d5d1974e)
......
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