Commit 5fd07220 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'non-x86_64-projects'

4b1ef814 tbb: hide from non-Intel architectures
bfac28e5

 tbb: hide from non-x86_64 builds
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Dan Lipsa's avatarDan Lipsa <dan.lipsa@kitware.com>
Merge-request: !846
parents fd42699d 4b1ef814
......@@ -43,7 +43,6 @@ function (superbuild_find_projects var)
boost
bzip2
cuda
embree
freetype
gdal
hdf5
......@@ -56,11 +55,7 @@ function (superbuild_find_projects var)
netcdf
nlohmannjson
numpy
openimagedenoise
openpmd
openvkl
ospray
ospraymodulempi
paraviewweb
paraviewwebglance
paraviewweblite
......@@ -93,10 +88,8 @@ function (superbuild_find_projects var)
pythonzopeinterface
pytz
qt5
rkcommon
silo
szip
tbb
visitbridge
vortexfinder2
vrpn
......@@ -105,6 +98,28 @@ function (superbuild_find_projects var)
zfp
zlib)
# These projects only support Intel processors.
set(tbb_supported OFF)
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
set(tbb_supported ON)
# These are publicly available, but are behind logins or license
# acceptances. Rehosted internally at Kitware for build machines.
list(APPEND projects
tbb) # x86_64-only
# TBB-using projects
list(APPEND projects
embree
openimagedenoise
openvkl
ospray
ospraymodulempi
rkcommon)
endif ()
set_property(GLOBAL PROPERTY
superbuild_tbb_supported "${tbb_supported}")
if (UNIX)
list(APPEND projects
cosmotools
......
......@@ -119,6 +119,14 @@ else ()
set(paraview_build_shared_libs "${BUILD_SHARED_LIBS_paraview}")
endif ()
get_property(paraview_tbb_supported GLOBAL
PROPERTY superbuild_tbb_supported)
set(paraview_tbb_dependencies)
if (paraview_tbb_supported)
list(APPEND paraview_tbb_dependencies
tbb ospray)
endif ()
superbuild_add_project(paraview
DEBUGGABLE
DEFAULT_ON
......@@ -126,13 +134,14 @@ superbuild_add_project(paraview
DEPENDS_OPTIONAL
adios2 cuda boost fortran gdal hdf5 matplotlib mpi numpy png protobuf
python python3 qt5 visitbridge zlib silo las lookingglass fides
xdmf3 ospray vrpn vtkm tbb netcdf
xdmf3 vrpn vtkm netcdf
openpmd
nlohmannjson
paraviewgettingstartedguide
paraviewtutorialdata paraviewweb
${paraview_all_plugins}
${paraviews_platform_dependencies}
${paraview_tbb_dependencies}
${PARAVIEW_EXTERNAL_PROJECTS}
CMAKE_ARGS
......
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