diff --git a/.github/workflows/Spack.yml b/.github/workflows/Spack.yml index f5408b8f..a02299ab 100644 --- a/.github/workflows/Spack.yml +++ b/.github/workflows/Spack.yml @@ -21,12 +21,8 @@ jobs: strategy: matrix: os: ["ubuntu-latest"] - sharedlibs: ["+shared", "~shared"] - pic: ["+pic", "~pic"] + picshared: ["+pic +shared", "+pic ~shared", "~pic"] precision: ["precision=d", "precision=4", "precision=8"] - exclude: - - sharedlibs: +shared - pic: ~pic runs-on: ${{ matrix.os }} diff --git a/spack/package.py b/spack/package.py index 6934b2a8..81eba9d9 100644 --- a/spack/package.py +++ b/spack/package.py @@ -36,7 +36,7 @@ class W3emc(CMakePackage): description="Set precision (_4/_d/_8 library versions)", when="@2.10:", ) - variant("shared", default=False, description="Build shared library", when="@2.10:") + variant("shared", default=False, description="Build shared library", when="@2.10: +pic") variant( "extradeps", default=False, @@ -45,7 +45,6 @@ class W3emc(CMakePackage): ) conflicts("+shared +extradeps", msg="Shared library cannot be built with unknown dependencies") - conflicts("+shared ~pic") depends_on("bufr", when="@2.10: +bufr") depends_on("bacio", when="@2.9.2:")