Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ISIS Recipe Changes #4224

Merged
merged 4 commits into from
Jan 11, 2021
Merged

ISIS Recipe Changes #4224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55a7211
Updated recipe meta.yaml
acpaquette Dec 30, 2020
1893ca5
Updated build.sh to include jenkins kakadu area
acpaquette Dec 30, 2020
1ee3e3d
Updated ale version in recipe
acpaquette Dec 31, 2020
e23c416
Updated ale version in environment.ymls
acpaquette Dec 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion environment.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An absolute path here seems odd. Is this a testing leftover?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah this is going to cause build errors if someone has their kakadu headers elsewhere

ninja install
32 changes: 12 additions & 20 deletions recipe/meta.yaml
View file
Open in desktop
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