Commit 09aaacf0 authored by Jesse Mapel's avatar Jesse Mapel
Browse files

Revert "Ale integration into dev (#3464)" 

This reverts commit 48e4efd1.
parent a72a38e3

environment.yml

+50 −45
Original line number Diff line number Diff line 
channels:

  - conda-forge

  - usgs-astrogeology

  - conda-forge

  - defaults



dependencies:

  - ale>=0.3.2

  - armadillo

  - blas

  - bullet

  - bz2file

  - bzip2

  - armadillo==8.200.0

  - blas==1.1

  - bullet==2.86.1

  - bz2file==0.98

  - bzip2==1.0.6

  - cmake>=3.10

  - cspice

  - curl

  - doxygen

  - eigen

  - embree

  - geos=3.5.1

  - geotiff

  - gmm

  - gmp

  - gsl

  - hdf5

  - icu

  - jama

  - cspice==66

  - curl==7.60.0

  - doxygen==1.8.14

  - eigen==3.3.3

  - embree==2.14.0

  - geos==3.5.1

  - geotiff==1.4.2

  - gmm==5.0

  - gmp==6.1.2

  - gsl==2.2.1

  - hdf5==1.8.18

  - icu==58.2

  - jama==125

  - jpeg==9b

  - kakadu==1

  - krb5

  - krb5==1.14.2

  - libpng>=1.6.34

  - libprotobuf=3.9.1

  - libtiff

  - libxml2

  - libprotobuf==3.5.2

  - libtiff>=4.0.9

  - libxml2==2.9.7

  - make

  - mesalib

  - mysql

  - mysql-connector-c

  - nanoflann

  - nlohmann_json

  - mesalib==17.2.0

  - mysql==5.7.20

  - mysql-connector-c==6.1.6

  - nanoflann==1.2.2

  - ninja==1.7.2

  - conda-forge/label/gcc7::nn

  - opencv>=3.0.0,<=4.0.0

  - openssl

  - pcl

  - protobuf=3.9.1

  - qhull

  - openblas==0.2.19

  - opencv

  - openssl==1.0.2n

  - pcl==1.8.1

  - pip==9.0.1

  - protobuf==3.5.2

  - python==3.6

  - qhull==7.2.0=0

  - qt=5.9.6

  - qwt=6.1.3

  - sqlite

  - suitesparse

  - superlu

  - tnt

  - x264

  - xalan-c

  - xerces-c

  - xorg-kbproto

  - setuptools=38.5.1

  - sip==4.18

  - sqlite==3.13.0

  - suitesparse==4.5.4

  - superlu==5.2.1

  - tnt==126=0

  - wheel==0.30.0

  - x264==20131218

  - xalan-c==1.11

  - xerces-c==3.1.4

  - xorg-kbproto==1.0.7

  - xorg-libice

  - xorg-libsm

  - xorg-libx11

  - xorg-libx11==1.6.4

  - xorg-libxi

  - zlib
 
  - zlib==1.2.11

isis/CMakeLists.txt

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

                                        wserialization)



find_package(Ale               REQUIRED)

find_package(Json              REQUIRED)

find_package(Bullet    2.86    REQUIRED)

find_package(Cholmod   4.4.5   REQUIRED)

find_package(CSPICE    65      REQUIRED)
@@ -272,7 +270,7 @@ find_package(HDF5 1.8.15 REQUIRED) 
find_package(Jama      125     REQUIRED)

find_package(NN                REQUIRED)

find_package(OpenCV    3.1.0   REQUIRED)

find_package(PCL       1.9     REQUIRED)

find_package(PCL       1.8     REQUIRED)

find_package(Protobuf  2.6.1   REQUIRED)

find_package(Qwt       6       REQUIRED)

find_package(SuperLU   4.3     REQUIRED)

isis/cmake/FindAle.cmake

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
# CMake module for find_package(Ale)

# Finds include directory and all applicable libraries

#

# Sets the following:

#   ALE_INCLUDE_DIR

#   ALE_LIBRARY



find_path(ALE_INCLUDE_DIR

    NAMES ale.h

)



find_library(ALE_LIBRARY

  NAMES ale

)



message(STATUS "ALE INCLUDE DIR: "  ${ALE_INCLUDE_DIR} )

message(STATUS "ALE LIB: "  ${ALE_LIBRARY} )



get_filename_component(ALE_ROOT_INCLUDE_DIR "${ALE_INCLUDE_DIR}" DIRECTORY)

isis/cmake/FindGeos.cmake

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#   GEOS_LIBRARY



find_path(GEOS_INCLUDE_DIR

  NAMES geos.h

  NAME geos.h

  PATH_SUFFIXES "geos/geos${Geos_FIND_VERSION}" "geos"

)

isis/cmake/FindJson.cmake

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
# CMake module for find_package(Json)

# Finds include directory and all applicable libraries

#

# Sets the following:

#   JSON_INCLUDE_DIR

#   JSON_LIBRARY





find_path(JSON_INCLUDE_DIR

    NAME json.hpp

    PATH_SUFFIXES "nlohmann"

)



message(STATUS "JSON INCLUDE DIR: "  ${JSON_INCLUDE_DIR} )