Skip to content
Snippets Groups Projects
Commit a8d67777 authored by Oriol Tintó's avatar Oriol Tintó
Browse files

Adding libfyaml as a generic dependency instead of using it only when psp is activated

parent 4be2328d
No related branches found
No related tags found
No related merge requests found
Pipeline #20111 passed
...@@ -59,9 +59,9 @@ class IconNwp(Package): ...@@ -59,9 +59,9 @@ class IconNwp(Package):
depends_on("netcdf-fortran") depends_on("netcdf-fortran")
depends_on("eccodes+fortran") depends_on("eccodes+fortran")
depends_on("libxml2") depends_on("libxml2")
depends_on("libfyaml")
depends_on("petsc", when="@psp") depends_on("petsc", when="@psp")
depends_on("libfyaml", when="@psp")
depends_on("petsc", when="+petsc") depends_on("petsc", when="+petsc")
depends_on("tenstream", when="@plexrt") depends_on("tenstream", when="@plexrt")
depends_on("tenstream", when="+plexrt") depends_on("tenstream", when="+plexrt")
...@@ -115,6 +115,7 @@ class IconNwp(Package): ...@@ -115,6 +115,7 @@ class IconNwp(Package):
f"-L{spec['netcdf-fortran'].prefix.lib} -lnetcdff", # netcdf-fortran libs f"-L{spec['netcdf-fortran'].prefix.lib} -lnetcdff", # netcdf-fortran libs
f"-L{spec['eccodes'].prefix.lib} -leccodes_f90 -leccodes", f"-L{spec['eccodes'].prefix.lib} -leccodes_f90 -leccodes",
f"-L{spec['libxml2'].prefix.lib} -lxml2", # XML2 libs f"-L{spec['libxml2'].prefix.lib} -lxml2", # XML2 libs
f"-L{spec['libfyaml'].prefix.lib} -lfyaml", # libfyaml libs.
] ]
if self.spec.satisfies("%gcc"): if self.spec.satisfies("%gcc"):
...@@ -122,8 +123,6 @@ class IconNwp(Package): ...@@ -122,8 +123,6 @@ class IconNwp(Package):
elif self.spec.satisfies("%intel"): elif self.spec.satisfies("%intel"):
libs.append("-qmkl=sequential") libs.append("-qmkl=sequential")
if self.spec.satisfies('@psp'):
libs.append("-lfyaml")
mtune = "generic" mtune = "generic"
CPPFLAGS = [] CPPFLAGS = []
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment