Unverified Commit fe149f56 authored by Jesse Mapel's avatar Jesse Mapel Committed by GitHub
Browse files

Removed GMM++ dependency (#4265) 

* Removed GMM

* Removed from environment
parent 58ca313b

environment.yml

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ dependencies: 
  - embree

  - geos>=3.7,<3.8

  - geotiff

  - gmm

  - gmp

  - gsl>=2.6

  - hdf5

environment_gcc4.yml

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ dependencies: 
  - embree

  - geos=3.7.1

  - geotiff

  - gmm

  - gmp

  - gsl

  - hdf5

isis/CMakeLists.txt

+1 −3
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ set(thirdPartyCppFlags -Wall 
                       -Wno-strict-aliasing

                       -DUSE_UNSTABLE_GEOS_CPP_API=1

                       -Wno-strict-overflow

                       -DGMM_USES_SUPERLU

                       -DENABLEJP2K=${JP2KFLAG}

                     )
@@ -273,7 +272,6 @@ find_package(CSPICE 65 REQUIRED) 
find_package(Eigen             REQUIRED)

find_package(Embree    2.15.0  REQUIRED)

find_package(GeoTIFF   2       REQUIRED)

find_package(GMM       5.0     REQUIRED)

SET(GSL_ROOT_DIR $ENV{CONDA_PREFIX})

find_package(GSL       2.2.1   REQUIRED)

find_package(HDF5      1.8.15  REQUIRED)

isis/cmake/FindGMM.cmake

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

# Finds include directory and all applicable libraries

#

# Sets the following:

#   GMM_INCLUDE_DIR



find_path(GMM_INCLUDE_DIR

  NAMES gmm.h

  PATH_SUFFIXES "/gmm/gmm-${GMM_FIND_VERSION}/gmm/" "gmm"

)



get_filename_component(GMM_ROOT_INCLUDE_DIR "${GMM_INCLUDE_DIR}" DIRECTORY)



message(STATUS "GMM INCLUDE DIR: ${GMM_INCLUDE_DIR}")

recipe/meta.yaml

+0 −2
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ requirements: 
  - embree

  - geos>=3.7,<3.8

  - geotiff

  - gmm

  - gmp

  - gsl>=2.6

  - hdf5
@@ -114,7 +113,6 @@ requirements: 
  - embree

  - geos>=3.7,<3.8

  - geotiff

  - gmm

  - gsl>=2.6

  - hdf5

  - icu