Unverified Commit f7011ab9 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by GitHub
Browse files

Making the conda recipe work again* (#3986) 

* changed nn dep

* added kakadu incs path

* added up to date ale

* findale renamed

* updated version

* removed data vars, added buildTets=OFF
parent bd41cece

isis/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ find_package(Boost 1.59.0 REQUIRED atomic 
                                        random

                                        wserialization)



find_package(ale               REQUIRED)

find_package(Ale               REQUIRED)

find_package(Json              REQUIRED)

find_package(Bullet    2.86    REQUIRED)

find_package(Cholmod   4.4.5   REQUIRED)

isis/cmake/Findale.cmake→isis/cmake/FindAle.cmake

+0 −0

File moved.

View file

recipe/build.sh

+1 −1
Original line number Diff line number Diff line 
mkdir build

cd build

export ISISROOT=$PWD

cmake -GNinja -DJP2KFLAG=ON -Dpybindings=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX -Disis3Data=/usgs/cpkgs/isis3/data -Disis3TestData=/usgs/cpkgs/isis3/testData ../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

recipe/meta.yaml

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#       A Public Release for ISIS3.6.1:                        {% set version = "3.6.1" %}

#       A Release Candidate for ISIS3.6.1:                     {% set version = "3.6.1_RC" %}

#       A custom build of ISIS3.6.1 for the CaSSIS mission:    {% set version = "3.6.1_cassis" %}

{% set version = "4.1.0_RC1" %}

{% set version = "4.2.0" %}



# This is the build number for the current version you are building. If this is the first build of

# this version, the build number will be 0. It is incremented by 1 with every consecutive build of
@@ -44,7 +44,7 @@ build: 
# Shotgun strat on requirements until we can narrow them down

requirements:

  build:

  - ale >=0.8.1

  - ale >=0.8.4

  - boost=1.68.0

  - armadillo==8.200.0

  - blas
@@ -131,7 +131,7 @@ requirements: 
  - mysql-connector-c

  - nanoflann

  - nlohmann_json

  - conda-forge/label/gcc7::nn

  - nn

  - opencv=3.2.0

  - openssl>=1.0.0,<1.1.0

  - pcl