Unverified Commit 51ad1d94 authored by Kaitlyn Lee's avatar Kaitlyn Lee Committed by GitHub
Browse files

Merge pull request #456 from SgStapleton/cmake 

Looks good!
parents 03597eb4 9778b4e3

environment.yml

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ dependencies: 
  - bzip2==1.0.6=1

  - cmake==3.9.1=0

  - cspice==66-0

  - curl==7.60.0=0

  - doxygen==1.8.14=0

  - eigen==3.3.3=0

  - embree==2.14.0=0

isis/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ set(thirdPartyCppFlags -Wall 
                       -DISIS_LITTLE_ENDIAN=1

                       -Wno-unused-parameter

                       -Wno-overloaded-virtual

                       -Wno-strict-aliasing

                       -DGMM_USES_SUPERLU

                       -DENABLEJP2K=${JP2KFLAG}

                     )