summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorToyohisa Kameyama <kameyama@riken.jp>2022-01-28 17:29:18 +0900
committerGitHub <noreply@github.com>2022-01-28 01:29:18 -0700
commit693f0958b5c437795992d4388978e17ec72559fd (patch)
treed16f64d84495ed05443555a5836239146a7cb775 /var
parent2fd26be9889847b9bc75fde160e263e3b98448c3 (diff)
downloadspack-693f0958b5c437795992d4388978e17ec72559fd.tar.gz
spack-693f0958b5c437795992d4388978e17ec72559fd.tar.bz2
spack-693f0958b5c437795992d4388978e17ec72559fd.tar.xz
spack-693f0958b5c437795992d4388978e17ec72559fd.zip
trilinos: version 12 cxxstd flags (#28582)
* trilinos: version 12 requires cxxstd=11 * trilinos: use cmake version 3.21 or old when trilinos version 12 * conflict cxxstd=17 and cmake@3.2.[01] * trilinos: version 12 requires cxxstd=11. * Trilinos_CXX11_FLAGS is set to ' ' to avoid inject C++11 flag. * set Trilinos_CXX11_FLAGS only version 12 or older.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/trilinos/package.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py
index a130447979..f15c339424 100644
--- a/var/spack/repos/builtin/packages/trilinos/package.py
+++ b/var/spack/repos/builtin/packages/trilinos/package.py
@@ -261,6 +261,7 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
)
conflicts('+adios2', when='@:12.14.1')
conflicts('cxxstd=11', when='@master:')
+ conflicts('cxxstd=17', when='@:12')
conflicts('cxxstd=11', when='+wrapper ^cuda@6.5.14')
conflicts('cxxstd=14', when='+wrapper ^cuda@6.5.14:8.0.61')
conflicts('cxxstd=17', when='+wrapper ^cuda@6.5.14:10.2.89')
@@ -523,6 +524,10 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage):
define_from_variant('Amesos2_ENABLE_LAPACK', 'amesos2'),
])
+ if spec.version < Version('13'):
+ # Suppress TriBITS flags in favor of CMake's built-in flags
+ options.append(define('Trilinos_CXX11_FLAGS', ' '))
+
if '+dtk' in spec:
options.extend([
define('Trilinos_EXTRA_REPOSITORIES', 'DataTransferKit'),