Commit 91b2cdbd authored by Kelvinrr's avatar Kelvinrr
Browse files

getting conda working for linux

parent 795baba4

isis/cmake/FindAllDependencies.cmake

+9 −9
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)
@@ -74,15 +74,15 @@ find_package(TIFF 4.0.5 REQUIRED) # "tiff/tiff-${TIFF_FIND_VERSION}" 
find_package(TNT       126     REQUIRED) # TNT version is 1.2.6, but v007 directory is "tnt/tnt126/"

find_package(XercesC   3.1.2   REQUIRED) # "xercesc/xercesc-${XercesC_FIND_VERSION}/"

find_package(X11       6       REQUIRED)

find_package(OpenGL            REQUIRED)

find_package(nanoflann         REQUIRED)

find_package(png               REQUIRED)

find_package(PNG               REQUIRED)

find_package(Kakadu)



# v007 might have different versions installed for our mac and linux systems.

# Im this case, we specify the version numbers being searched for in the non-traditional installs.

if(APPLE)

  find_package(Geos    3.5.0   REQUIRED)

  find_package(OpenGL            REQUIRED)

else(APPLE)

  find_package(Geos    3.5.1   REQUIRED)

endif(APPLE)

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/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);

  }

}