Skip to content

Commit

Permalink
update spack recipe with correct ip deps
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexanderRichert-NOAA committed Jul 12, 2024
1 parent fc06d0c commit 17b6b64
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions spack/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
"jasper": "USE_JASPER",
"openmp": "USE_OPENMP",
"wmo_validation": "USE_WMO_VALIDATION",
"ipolates": "USE_IPOLATES",
"disable_timezone": "DISABLE_TIMEZONE",
"disable_alarm": "DISABLE_ALARM",
"fortran_api": "MAKE_FTN_API",
"disable_stat": "DISABLE_STAT",
"openjpeg": "USE_OPENJPEG",
"ipolates": "USE_IPOLATES",
}


Expand Down Expand Up @@ -148,9 +148,9 @@ def url_for_version(self, version):
conflicts("+openmp", when="%apple-clang")

depends_on("wget", type=("build"), when="@:3.1 +netcdf4")
depends_on("ip@:3", when="@3.2: ipolates=1")
depends_on("ip2", when="@3.2: ipolates=3")
depends_on("sp", when="@3.2: ipolates=1")
depends_on("ip@:3", when="@3.2 ipolates=1")
depends_on("ip2", when="@3.2 ipolates=3")
depends_on("[email protected]:", when="@develop ipolates=1")
depends_on("[email protected]:", when="@3.2: +aec")
depends_on("netcdf-c", when="@3.2: +netcdf4")
depends_on("jasper@:2", when="@3.2: +jasper")
Expand Down Expand Up @@ -182,7 +182,6 @@ class CMakeBuilder(spack.build_systems.cmake.CMakeBuilder):
def cmake_args(self):
args = [self.define_from_variant(variant_map[k], k) for k in variant_map]
# args.append(self.define_from_variant("BUILD_LIB", "lib"))
# args.append(self.define_from_variant("BUILD_LIB", "lib"))
# args.append(self.define_from_variant("BUILD_SHARED_LIB", "shared"))

return args
Expand Down

0 comments on commit 17b6b64

Please sign in to comment.