From 18d506c7fbed6d5f0802b4ed4f997d14e4391a74 Mon Sep 17 00:00:00 2001 From: "Seth R. Johnson" Date: Mon, 8 Nov 2021 08:29:35 -0500 Subject: trilinos: disable optional packages by default (#26815) --- var/spack/repos/builtin/packages/trilinos/package.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index ae8cd1a43d..4e6ff07e3c 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -295,6 +295,7 @@ class Trilinos(CMakePackage, CudaPackage): depends_on('hypre~internal-superlu~int64', when='+hypre') depends_on('kokkos-nvcc-wrapper', when='+wrapper') depends_on('lapack') + # depends_on('perl', type=('build',)) # TriBITS finds but doesn't use... depends_on('libx11', when='+x11') depends_on('matio', when='+exodus') depends_on('metis', when='+zoltan') @@ -438,20 +439,18 @@ class Trilinos(CMakePackage, CudaPackage): options.extend([ define('Trilinos_VERBOSE_CONFIGURE', False), define_from_variant('BUILD_SHARED_LIBS', 'shared'), - define_from_variant("CMAKE_CXX_STANDARD", "cxxstd"), - define_trilinos_enable('TESTS', False), - define_trilinos_enable('EXAMPLES', False), + define_from_variant('CMAKE_CXX_STANDARD', 'cxxstd'), + define_trilinos_enable('ALL_OPTIONAL_PACKAGES', False), + define_trilinos_enable('ALL_PACKAGES', False), define_trilinos_enable('CXX11', True), define_trilinos_enable('DEBUG', 'debug'), + define_trilinos_enable('EXAMPLES', False), + define_trilinos_enable('SECONDARY_TESTED_CODE', True), + define_trilinos_enable('TESTS', False), define_trilinos_enable('Fortran'), define_trilinos_enable('OpenMP'), define_trilinos_enable('EXPLICIT_INSTANTIATION', 'explicit_template_instantiation') - # The following can cause problems on systems that don't have - # static libraries available for things like dl and pthreads - # for example when trying to build static libs - # define_from_variant('TPL_FIND_SHARED_LIBS', 'shared') - # define('Trilinos_LINK_SEARCH_START_STATIC', '+shared' not in spec) ]) # ################## Trilinos Packages ##################### -- cgit v1.2.3-60-g2f50