Commit d9d18a78 authored by chrisryancombs's avatar chrisryancombs
Browse files

Added Qt support and temporarily removed SIP

parent 54f27fbc

environment.yml

+4 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ dependencies: 
  - protobuf==3.5.2

  - libprotobuf==3.5.2

  - qwt=6.1.3

  - pyqt==5.6.0

  # - pyqt==5.6.0

  - sip==4.18

  - mysql==5.7.20

  - ninja==1.7.2=0
@@ -46,14 +46,14 @@ dependencies: 
  - mesalib==17.2.0=0

  - mysql-connector-c==6.1.6=0

  - nn==1.86.0=2

  - numpy==1.13.3=py36_blas_openblas_200

  # - numpy==1.13.3=py36_blas_openblas_200

  - openblas==0.2.19=2

  - opencv==3.3.0

  - nanoflann==1.2.2

  - gmm==5.0

  - jama==125

  - openssl==1.0.2n=0

  - python==3.6

  # - python==3.6

  - sqlite==3.13.0=1

  - suitesparse==4.5.4=blas_openblas_200

  - superlu==5.2.1=blas_openblas_201
@@ -62,7 +62,7 @@ dependencies: 
  - bz2file==0.98

  - bullet==2.86.1=0

  - qhull==7.2.0=0

  - qt=5.6.2

  - qt=5.7.1

  - qwt

  - tnt==126=0

  - xalan-c==1.11

isis/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ option(buildCore "Build the core ISIS modules" ON ) 
option(buildMissions   "Build the mission specific modules"             ON  )

option(buildStaticCore "Build libisis3 static as well as dynamic"       OFF )

option(buildTests      "Set up unit, application, and module tests."    ON  )

option(JP2KFLAG        "Whether or not to build using JPEG2000 support" ON  )

option(pybindings      "Turn on to build Python bindings"               ON )

option(JP2KFLAG        "Whether or not to build using JPEG2000 support" OFF )

option(pybindings      "Turn on to build Python bindings"               OFF )



# if cmake install prefix is not set, and conda env is activated, use the

# conda env as the install directory