Commit 9a1a9f9a authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

Merge branch 'conda' of https://github.com/Kelvinrr/isis3_cmake into conda

parents 78cc257b c03fa2b1

isis/cmake/FindAllDependencies.cmake

+7 −7
Original line number Diff line number Diff line 
#===============================================================================

#==============================================================================

# High level script to handle all required 3rd party dependencies

# - All of them are expected to be in the 3rdParty folder, this script does not

#   go looking for them if they are not?

#===============================================================================



message("CONDA PREFIX: $ENV{CONDA_PREFIX}")

set(CMAKE_LIBRARY_PATH $ENV{$CONDA_PREFIX})

set(CMAKE_INCLUDE_PATH $ENV{$CONDA_PREFIX})

list(APPEND CMAKE_FIND_ROOT_PATH $ENV{CONDA_PREFIX} $ENV{CONDA_PREFIX}/lib/cmake/Qt5)

message("Test: ${CMAKE_FIND_ROOT_PATH}") 



# Add thirdPartyCppFlags

set(thirdPartyCppFlags ${thirdPartyCppFlags} -DGMM_USES_SUPERLU)

set(thirdPartyCppFlags ${thirdPartyCppFlags} -fext-numeric-literals -DGMM_USES_SUPERLU)

set(thirdPartyCppFlags ${thirdPartyCppFlags} "-DENABLEJP2K=${JP2KFLAG}")



# Paths to required executables
@@ -43,8 +43,8 @@ find_package(Qt5 COMPONENTS 
                Svg

                Test

		WebChannel

                WebEngine

                WebEngineWidgets

		WebKit

		WebKitWidgets

                Widgets

                Xml

                XmlPatterns REQUIRED)

isis/cmake/FindCSPICE.cmake

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


find_path(CSPICE_INCLUDE_DIR

  NAME SpiceUsr.h

  PATH_SUFFIXES naif

  PATH_SUFFIXES naif cspice

)



find_library(CSPICE_LIBRARY

isis/src/qisis/objs/FeatureNomenclatureTool/FeatureNomenclatureTool.cpp

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include <QProgressBar>

#include <QPushButton>

#include <QSettings>

#include <QPainter>

#include <QUrl>



#include <geos/geom/Coordinate.h>

#include <geos/geom/CoordinateSequence.h>

isis/src/qisis/objs/QIsisApplication/QIsisApplication.cpp

+1 −9
Original line number Diff line number Diff line
@@ -7,11 +7,6 @@ 
#include <QObject>

#include <QMessageBox>

#include <QUrl>

#if defined(__APPLE__)

#include <QtWebEngineWidgets/QWebEngineView>

#else

#include <QWebEngineView>

#endif



#include "FileName.h"

#include "Preference.h"
@@ -92,9 +87,6 @@ namespace Isis { 
   * Open a URL in the browser specified by Isis.

   */

  void QIsisApplication::openUrl(QUrl url) {

     QWebEngineView *view = new QWebEngineView(NULL);

     view->setAttribute(Qt::WA_DeleteOnClose);

     view->load(url);

     view->show();

     QDesktopServices::openUrl(url);

  }

}

linux-spec.txt

0 → 100644
+118 −0
Original line number Diff line number Diff line 
# This file may be used to create an environment using:

# $ conda create --name <env> --file <this file>

# platform: linux-64

@EXPLICIT

https://conda.anaconda.org/conda-forge/linux-64/blas-1.1-openblas.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/boost-1.65.1-py27_0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/boost-cpp-1.65.1-1.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/bullet-2.86.1-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.6-1.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/ca-certificates-2017.08.26-h1d4fec5_0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/cairo-1.14.6-4.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/certifi-2018.1.18-py27_0.tar.bz2

https://repo.continuum.io/pkgs/main/linux-64/cloog-0.18.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/cmake-3.9.1-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/cspice-66-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/curl-7.55.1-0.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/dbus-1.10.20-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/doxygen-1.8.14-0.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/ds9-7.5-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/eigen-3.3.3-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/embree-2.14.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/expat-2.2.5-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/ffmpeg-3.2.4-3.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/flann-1.8.4-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/fontconfig-2.12.1-4.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/freeglut-3.0.0-4.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/freetype-2.7-1.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/future-0.16.0-py27_1.tar.bz2

https://repo.continuum.io/pkgs/free/linux-64/gcc-4.8.5-7.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/geos-3.5.1-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/geotiff-1.4.2-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/gettext-0.19.8.1-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/giflib-5.1.4-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/glib-2.51.4-0.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/gmm-5.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/gmp-6.1.2-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/gsl-2.2.1-blas_openblas_3.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/gst-plugins-base-1.8.0-0.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/gstreamer-1.8.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-1.3.4-2.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.8.18-2.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/icu-58.2-0.tar.bz2

https://repo.continuum.io/pkgs/main/linux-64/isl-0.12.2-0.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/jama-125-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/jasper-1.900.1-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/jbig-2.1-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/jpeg-9b-2.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/jsoncpp-1.8.3-h3a67955_0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/krb5-1.14.2-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/lapack-3.6.1-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libffi-3.2.1-3.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/libgcc-4.8.5-1.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/libgcc-ng-7.2.0-h7cc24e2_2.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/libgfortran-3.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.15-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.28-2.tar.bz2

https://conda.anaconda.org/probcomp/linux-64/libprotobuf-2.6.1-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.8.0-2.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/libstdcxx-ng-7.2.0-h7a57d05_2.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.0.9-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libuv-1.11.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libwebp-0.5.2-7.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/libxcb-1.12-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.9.7-0.tar.bz2

https://conda.anaconda.org/conda-forge/noarch/llvm-meta-5.0.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/llvmdev-5.0.0-default_1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/m4-1.4.17-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/mesalib-17.2.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/metis-5.1.0-3.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/mpc-1.0.3-4.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/mpfr-3.1.5-0.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/mysql-5.7.20-h55eaa98_0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/mysql-connector-c-6.1.6-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/nanoflann-1.2.2-0.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/ncurses-5.9-10.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/ninja-1.7.2-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/nn-1.86.0-2.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/numpy-1.13.3-py27_blas_openblas_200.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/openblas-0.2.19-2.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/opencv-3.2.0-np113py27_blas_openblas_203.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/openssl-1.0.2n-0.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/patchelf-0.9-hf79760b_2.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/pcl-1.8.1-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/pcre-8.39-0.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/pip-9.0.1-py27_1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/pixman-0.34.0-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/proj4-4.9.3-5.tar.bz2

https://repo.continuum.io/pkgs/free/linux-64/protobuf-2.6.1-py27_1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/pthread-stubs-0.3-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/python-2.7.14-2.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/qhull-7.2.0-0.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/qt-5.7.1-0.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/qwt-6.1.3-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/readline-6.2-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/rhash-1.3.4-0.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/setuptools-38.5.1-py27_0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/six-1.11.0-py27_1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.13.0-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/suitesparse-4.5.4-blas_openblas_200.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/superlu-5.2.1-blas_openblas_201.tar.bz2

https://repo.continuum.io/pkgs/free/linux-64/system-5.8-2.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/tbb-4.4_20160526-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/tk-8.5.19-2.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/tnt-126-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/vtk-8.1.0-py27_mesalib_0.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/wheel-0.30.0-py27h2bc6bb2_1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/x264-20131217-3.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/xalan-c-1.11-0.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/xerces-c-3.1.4-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/xorg-kbproto-1.0.7-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.6.4-6.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/xorg-libxau-1.0.8-3.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/xorg-libxdmcp-1.1.2-3.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/xorg-libxrender-0.9.10-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/xorg-renderproto-0.11.1-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/xorg-xproto-7.0.31-6.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/xz-5.2.3-0.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/zlib-1.2.11-0.tar.bz2