Skip to content
Snippets Groups Projects
Commit e3c120cb authored by Gareth Tribello's avatar Gareth Tribello
Browse files

Merge branch 'v2.5' of https://github.com/plumed/plumed2 into v2.5

parents 6a281ade 183470d6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
conda/plumed/meta.yaml
+ 4
− 0
View file @ e3c120cb
...@@ -20,14 +20,18 @@ requirements: ...@@ -20,14 +20,18 @@ requirements:
build: build:
- {{ compiler('c') }} - {{ compiler('c') }}
- {{ compiler('cxx') }} - {{ compiler('cxx') }}
- llvm-openmp # [osx]
# xxd is provided by package vim and used during build # xxd is provided by package vim and used during build
- vim # [linux] - vim # [linux]
host: host:
- gsl - gsl
- libblas - libblas
- liblapack - liblapack
- llvm-openmp # [osx]
- xdrfile - xdrfile
- zlib - zlib
run:
- llvm-openmp # [osx]
test: test:
commands: commands:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment