From b4748de5a94dda2004167f24b54f3ab9d0c17fb4 Mon Sep 17 00:00:00 2001
From: Robert Cohn <robert.s.cohn@intel.com>
Date: Wed, 3 Jul 2024 17:04:38 -0400
Subject: [openfoam]: use latest cgal (#45003)
* [openfoam]: use latest cgal
* add version checks for CGAL
---
share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml | 2 +-
var/spack/repos/builtin/packages/openfoam/package.py | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
index 473631ec7a..b68c4ea86e 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
@@ -124,6 +124,7 @@ spack:
- netlib-scalapack
- nrm
- omega-h
+ - openfoam
- openmpi
- papi
- papyrus
@@ -189,7 +190,6 @@ spack:
# - glvis ^llvm # glvis: https://github.com/spack/spack/issues/42839
# - hpctoolkit # dyninst@12.3.0%gcc: /usr/bin/ld: libiberty/./d-demangle.c:142: undefined reference to `_intel_fast_memcpy'; can't mix intel-tbb@%oneapi with dyninst%gcc
# - mgard +serial +openmp +timing +unstructured ~cuda # mgard: mgard.tpp:63:48: error: non-constant-expression cannot be narrowed from type 'int' to 'unsigned long' in initializer list [-Wc++11-narrowing]
- # - openfoam # cgal: https://github.com/spack/spack/issues/39481
# - openpmd-api # mgard: mgard.tpp:63:48: error: non-constant-expression cannot be narrowed from type 'int' to 'unsigned long' in initializer list [-Wc++11-narrowing]
# - pdt # pdt: pdbType.cc:193:21: warning: ISO C++11 does not allow conversion from string literal to 'char *' [-Wwritable-strings]
# - quantum-espresso # quantum-espresso@7.2 /i3fqdx5: warning: <unknown>:0:0: loop not unroll-and-jammed: the optimizer was unable to perform the requested transformation; the transformation might be disabled or specified as part of an unsupported transformation ordering
diff --git a/var/spack/repos/builtin/packages/openfoam/package.py b/var/spack/repos/builtin/packages/openfoam/package.py
index 0919b9abd6..8558e49b09 100644
--- a/var/spack/repos/builtin/packages/openfoam/package.py
+++ b/var/spack/repos/builtin/packages/openfoam/package.py
@@ -369,8 +369,12 @@ class Openfoam(Package):
# See https://github.com/spack/spack/pull/22303 for reference
depends_on(Boost.with_default_variants)
- # OpenFOAM does not play nice with CGAL 5.X
- depends_on("cgal@:4")
+ # Earlier versions of OpenFOAM may not work with CGAL 5.6. I do
+ # not know which OpenFOAM added support for 5.x and conservatively
+ # use 2312 in the check.
+ depends_on("cgal", when="@2312:")
+ depends_on("cgal@:4", when="@:2306")
+
# The flex restriction is ONLY to deal with a spec resolution clash
# introduced by the restriction within scotch!
depends_on("flex@:2.6.1,2.6.4:")
--
cgit v1.2.3-70-g09d2