Skip to content

Commit

Permalink
ISIS Recipe Changes (#4224)
Browse files Browse the repository at this point in the history
* Updated recipe meta.yaml

* Updated build.sh to include jenkins kakadu area

* Updated ale version in recipe

* Updated ale version in environment.ymls
  • Loading branch information
acpaquette authored Jan 11, 2021
1 parent 2e98d81 commit aa02ab9
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 23 deletions.
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- defaults

dependencies:
- ale >=0.8.4
- ale >=0.8.5
- boost=1.68.0
- armadillo
- blas
Expand Down
2 changes: 1 addition & 1 deletion environment_gcc4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ channels:
- defaults

dependencies:
- ale>=0.8.4
- ale>=0.8.5
- boost=1.68.0
- armadillo
- blas
Expand Down
2 changes: 1 addition & 1 deletion recipe/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mkdir build
cd build
export ISISROOT=$PWD
cmake -GNinja -DJP2KFLAG=ON -Dpybindings=OFF -DbuildTests=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX ../isis
cmake -GNinja -DJP2KFLAG=ON -Dpybindings=OFF -DKAKADU_INCLUDE_DIR=/isisData/kakadu -DbuildTests=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX ../isis
ninja install
32 changes: 12 additions & 20 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,22 @@ build:
# Shotgun strat on requirements until we can narrow them down
requirements:
build:
- ale >=0.8.4
- boost=1.68.0
- cmake >=3.15
- doxygen
- make
- ninja==1.7.2
- openssl>=1.0.0,<1.1.0
- libprotobuf=3.9.1
- xalan-c

host:
- armadillo
- ale >=0.8.5
- boost=1.68.0
- blas
- bullet=2.86.1=0
- bz2file
- bzip2
- cmake >=3.15
- cspice
- curl
- eigen
Expand All @@ -69,19 +77,15 @@ requirements:
- kakadu==1
- krb5
- libpng>=1.6.34
- libprotobuf=3.9.1
- libtiff
- libxml2
- make
- mesalib
- mysql
- mysql-connector-c
- nanoflann
- nlohmann_json
- ninja==1.7.2
- nn
- opencv=3.2
- openssl>=1.0.0,<1.1.0
- pcl
- protobuf=3.9.1
- qhull
Expand All @@ -101,47 +105,36 @@ requirements:
- zlib

run:
- ale >=0.8.4
- ale >=0.8.5
- boost=1.68.0
- armadillo
- blas
- bullet=2.86.1=0
- bz2file
- bzip2
- cspice
- curl
- eigen
- embree
- geos>=3.7,<3.8
- geotiff
- gmm
- gmp
- gsl>=2.6
- hdf5
- icu
- jama
- jpeg==9b
- kakadu==1
- krb5
- libpng>=1.6.34
- libprotobuf=3.9.1
- libtiff
- libxml2
- mesalib
- mysql
- mysql-connector-c
- nanoflann
- nlohmann_json
- nn
- opencv=3.2
- openssl>=1.0.0,<1.1.0
- pcl
- protobuf=3.9.1
- qhull
- qt=5.9.6
- qwt=6.1.3
- sqlite
- suitesparse
- superlu
- tnt
- x264=20131218
Expand All @@ -151,7 +144,6 @@ requirements:
- xorg-libsm
- xorg-libx11
- xorg-libxi
- zlib

test:
commands:
Expand Down

0 comments on commit aa02ab9

Please sign in to comment.