Commit 370d5d22 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Copied isis directory from v006Libraries to this new branch to try to fix mergeinfo property. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/v006LibrariesV2@6696 41f8697f-d340-4b68-9986-7bafba869bb8
parent ea786ba6

isis/3rdParty/Makefile

+8 −2
Original line number Diff line number Diff line 
include $(ISISROOT)/make/isismake.os



.PHONY: libs plugins

.PHONY: libs license plugins



all:  install



install: libs plugins



libs:

libs: license

	@for library in $(THIRDPARTYLIBS); do                                \

	  $(INSTALL3P) $(INSTALL3POPTS) $$library $(ISISROOT)/3rdParty/lib/; \

	  echo $(CURTIMESTAMP) "  Installing [$$library]";                   \
@@ -51,6 +51,11 @@ libs: 
	  $(RM) DarwinErrors.lis DarwinLibs.lis;                             \

	fi                                                                 



license:

	echo $(CURTIMESTAMP) "  Obtaining licenses";                         \

	$(RSYNC) -a /usgs/pkgs/local/$(ISISLOCALVERSION)/license/            \

	  $(ISISROOT)/3rdParty/license/



plugins:

	@for plugs in $(THIRDPARTYPLUGINS); do                               \

	  echo $(CURTIMESTAMP) "  Installing [$$plugs...]";                  \
@@ -75,6 +80,7 @@ plugins: 
clean:

	rm -f lib/lib*.so* lib/lib*.dylib lib/lib*.a

	cd lib && rm -rf *.framework

	$(RM) -rf license

	@for plugs in plugins/*; do \

	  if [ -d $$plugs -a $$plugs != "plugins/CVS" ]; \

	  then \

isis/make/config.linux-x86_64

+148 −73
Original line number Diff line number Diff line
@@ -50,15 +50,20 @@ ISISSHAREDON = -Wl,-whole-archive 
ISISSHAREDOFF   = -Wl,-no-whole-archive

ISISARFLAGS     =



#---------------------------------------------------------------------------

# Set up for modifying the executable rpath

#---------------------------------------------------------------------------

PATCHELF = $(ISIS3LOCAL)/bin/patchelf



#---------------------------------------------------------------------------

# Set up local library designations

#---------------------------------------------------------------------------

ISIS3SYSINC ?= /usr/include

ISIS3SYSINC := /usr/include

#ISIS3SYSLIB ?= /usr/lib64

ISIS3SYSLIB ?= $(shell if [ -d /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi;)

ISIS3ALTSYSLIB ?= $(shell if [ -f /usr/lib/x86_64-linux-gnu/libgfortran.so.3 ]; then \

ISIS3SYSLIB := $(shell if [ -d /usr/lib64 ]; then echo "/usr/lib64"; else echo "/usr/lib"; fi;)

ISIS3ALTSYSLIB := $(shell if [ -f /usr/lib/x86_64-linux-gnu/libgfortran.so.3 ]; then \

    echo "/usr/lib/x86_64-linux-gnu"; else echo "/usr/lib64"; fi;)

ISIS3LOCAL  ?= /usgs/pkgs/local/$(ISISLOCALVERSION)

ISIS3LOCAL  := /usgs/pkgs/local/$(ISISLOCALVERSION)



#---------------------------------------------------------------------------

# Set up for cwd
@@ -78,40 +83,53 @@ ISIS3LOCAL ?= /usgs/pkgs/local/$(ISISLOCALVERSION) 
#---------------------------------------------------------------------------

# Set up for Qt

#---------------------------------------------------------------------------

QTINCDIR = -I$(ISIS3LOCAL)/include/qt/qt4.8.0

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.8.0/Qt

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.8.0/QtCore

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.8.0/QtAssistant

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.8.0/QtGui

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.8.0/QtNetwork

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.8.0/QtOpenGL

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.8.0/QtScript

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.8.0/QtScriptTools

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.8.0/QtSql

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.8.0/QtSvg

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.8.0/QtTest

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.8.0/QtWebKit

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.8.0/QtXml

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt4.8.0/QtXmlPatterns

QTINCDIR = -I$(ISIS3LOCAL)/include/qt/qt5.5.1

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/Qt

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtCore

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtAssistant

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtConcurrent

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtDBus

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtGui

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtMultimedia

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtMultimediaWidgets

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtNetwork

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtOpenGL

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtPositioning

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtPrintSupport

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtQml

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtQuick

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtScript

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtScriptTools

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtSensors

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtSql

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtSvg

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtTest

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtWebChannel

#QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtWebEngine

#QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtWebEngineWidgets

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtWebKit

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtWebKitWidgets

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtWidgets

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtXml

QTINCDIR += -I$(ISIS3LOCAL)/include/qt/qt5.5.1/QtXmlPatterns

QTLIBDIR = -L$(ISIS3LOCAL)/lib

QTLIB    = -lQtXmlPatterns -lQtXml -lQtNetwork -lQtSql -lQtGui -lQtCore -lQtSvg -lQtTest -lQtOpenGL -lQtWebKit -lQtDBus

QTLIB    = -lQt5Core -lQt5Concurrent -lQt5XmlPatterns -lQt5Xml -lQt5Network -lQt5Sql -lQt5Gui -lQt5PrintSupport -lQt5Positioning -lQt5Qml -lQt5Quick -lQt5Sensors -lQt5Svg -lQt5Test -lQt5OpenGL -lQt5Widgets -lQt5Multimedia -lQt5MultimediaWidgets -lQt5WebChannel -lQt5WebKit -lQt5WebKitWidgets -lQt5DBus



UIC      = $(ISIS3LOCAL)/bin/uic

MOC      = $(ISIS3LOCAL)/bin/moc

RCC      = $(ISIS3LOCAL)/bin/rcc

PATCHELF = $(ISIS3LOCAL)/bin/patchelf



#---------------------------------------------------------------------------

# Set up for Qwt

#---------------------------------------------------------------------------

QWTINCDIR = -I$(ISIS3LOCAL)/include/qwt/qwt6.0.1

QWTINCDIR = -I$(ISIS3LOCAL)/include/qwt

QWTLIBDIR = -L$(ISIS3LOCAL)/lib

QWTLIB    = -lqwt 



#---------------------------------------------------------------------------

# Set up for Xerces 

#---------------------------------------------------------------------------

XERCESINCDIR = -I$(ISIS3LOCAL)/include/xercesc/xercesc-3.1.1

XERCESINCDIR = -I$(ISIS3LOCAL)/include/xercesc/xercesc-3.1.2

XERCESLIBDIR = -L$(ISIS3LOCAL)/lib

XERCESLIB    = -lxerces-c
@@ -125,16 +143,16 @@ GEOTIFFLIB = -lgeotiff 
#---------------------------------------------------------------------------

# Set up for Tiff 

#---------------------------------------------------------------------------

TIFFINCDIR = -I$(ISIS3LOCAL)/include/tiff/tiff-4.0.1

TIFFINCDIR = -I$(ISIS3LOCAL)/include/tiff/tiff-4.0.5

TIFFLIBDIR = -L$(ISIS3LOCAL)/lib

TIFFLIB    = -ltiff



#---------------------------------------------------------------------------

# Set up for naif dsk and cspice libraries

#---------------------------------------------------------------------------

NAIFINCDIR = -I$(ISIS3LOCAL)/include/naif/cspice64/naif/dsklib -I$(ISIS3LOCAL)/include/naif/cspice64/naif

NAIFINCDIR = -I$(ISIS3LOCAL)/include/naif

NAIFLIBDIR = -L$(ISIS3LOCAL)/lib

NAIFLIB    = -ldsklib -lcspice

NAIFLIB    = -ldsk -lcspice



#---------------------------------------------------------------------------

# Set up for TNT
@@ -153,9 +171,9 @@ JAMALIB = 
#---------------------------------------------------------------------------

# Set up for GEOS

#---------------------------------------------------------------------------

GEOSINCDIR = -I$(ISIS3LOCAL)/include/geos/geos3.3.2

GEOSINCDIR = -I$(ISIS3LOCAL)/include/geos/geos3.5.0

GEOSLIBDIR = -L$(ISIS3LOCAL)/lib

GEOSLIB    = -lgeos-3.3.2 -lgeos_c

GEOSLIB    = -lgeos-3.5.0 -lgeos_c



#---------------------------------------------------------------------------

# Set up for the GNU Scientific Library (GSL).  Note that this setup
@@ -180,7 +198,7 @@ X11LIB = -lX11 
#---------------------------------------------------------------------------

# Set up for GMM

#---------------------------------------------------------------------------

GMMINCDIR = -I$(ISIS3LOCAL)/include/gmm/gmm-4.1 -I$(ISIS3LOCAL)/include/gmm/gmm-4.1/gmm

GMMINCDIR = -I$(ISIS3LOCAL)/include/gmm/gmm-5.0 -I$(ISIS3LOCAL)/include/gmm/gmm-5.0/gmm

GMMLIBDIR =

GMMLIB    =
@@ -194,7 +212,7 @@ SUPERLULIB = -lsuperlu_4.3 -lblas -lgfortran 
#---------------------------------------------------------------------------

# Set up for Google Protocol Buffers (ProtoBuf)

#---------------------------------------------------------------------------

PROTOBUFINCDIR = -I$(ISIS3LOCAL)/include/google-protobuf/protobuf2.4.1

PROTOBUFINCDIR = -I$(ISIS3LOCAL)/include/google-protobuf/protobuf2.6.1

PROTOBUFLIBDIR = -L$(ISIS3LOCAL)/lib

PROTOBUFLIB    = -lprotobuf

PROTOC         = $(ISIS3LOCAL)/bin/protoc
@@ -216,17 +234,17 @@ PROTOC = $(ISIS3LOCAL)/bin/protoc 
#  below (i.e., be sure to add -I, -L and -l to the variables for KAKADUINCDIR,

#  KAKADULIBDIR and KAKADULIB, respectively).

#---------------------------------------------------------------------------

KAKADUINCDIR ?= -I$(ISIS3LOCAL)/include/kakadu/v6_3-00967N

KAKADULIBDIR ?= -L$(ISIS3LOCAL)/lib

KAKADULIB    ?= -lkdu_a63R

KAKADUINCDIR := -I$(ISIS3LOCAL)/include/kakadu/v6_3-00967N

KAKADULIBDIR := -L$(ISIS3LOCAL)/lib

KAKADULIB    := -lkdu_a63R

#  Strip -I from Kakadu include directory macro and check for existance

JP2KFLAG ?= $(shell if [ -d $(subst -I,,$(KAKADUINCDIR)) ]; then echo "1"; else echo "0"; fi;)

JP2KFLAG := $(shell if [ -d $(subst -I,,$(KAKADUINCDIR)) ]; then echo "1"; else echo "0"; fi;)

ISISCPPFLAGS += -DENABLEJP2K=$(JP2KFLAG)



#---------------------------------------------------------------------------

# Set up for BOOST

#---------------------------------------------------------------------------

BOOSTINCDIR = -I$(ISIS3LOCAL)/include/boost/boost1.48.0

BOOSTINCDIR = -I$(ISIS3LOCAL)/include/boost/boost1.59.0

BOOSTLIBDIR = 

BOOSTLIB    = 

#BOOSTLIBDIR = -L$(ISIS3LOCAL)/lib
@@ -239,9 +257,9 @@ BOOSTLIB = 
#---------------------------------------------------------------------------

# Set up for Cholmod libraries 

#---------------------------------------------------------------------------

CHOLMODINCDIR = -I$(ISIS3LOCAL)/include/CHOLMOD/CHOLMOD1.7.3

CHOLMODINCDIR = -I$(ISIS3LOCAL)/include/SuiteSparse/SuiteSparse4.4.5/SuiteSparse

CHOLMODLIBDIR = -L$(ISIS3LOCAL)/lib

CHOLMODLIB    = -lcholmod -lamd -lcolamd -llapack

CHOLMODLIB    = -lcholmod -lamd -lcamd -lccolamd -lcolamd -llapack -lsuitesparseconfig



#---------------------------------------------------------------------------

# Set up for HDF5 libraries
@@ -289,62 +307,119 @@ DEFAULTINCDIR = -I$(ISIS3LOCAL)/include 
#---------------------------------------------------------------------------



#  Libraries

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtXmlPatterns.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtXmlPatterns.so.4"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtXmlPatterns.so.4.8*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5.5.*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Core.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Core.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Core.so.5.5*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5DBus.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5DBus.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5DBus.so.5.5*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Gui.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Gui.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Gui.so.5.5*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Multimedia.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Multimedia.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Multimedia.so.5.5.*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5MultimediaWidgets.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5MultimediaWidgets.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5MultimediaWidgets.so.5.5.*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Network.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Network.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Network.so.5.5*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtXml.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtXml.so.4"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtXml.so.4.8*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5OpenGL.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5OpenGL.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5OpenGL.so.5.5*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtNetwork.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtNetwork.so.4"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtNetwork.so.4.8*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Positioning.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Positioning.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Positioning.so.5.5.*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtSql.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtSql.so.4"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtSql.so.4.8*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5PrintSupport.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5PrintSupport.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5PrintSupport.so.5.5.*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtGui.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtGui.so.4"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtGui.so.4.8*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Qml.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Qml.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Qml.so.5.5.*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtCore.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtCore.so.4"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtCore.so.4.8*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Quick.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Quick.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Quick.so.5.5*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtSvg.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtSvg.so.4"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtSvg.so.4.8*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Sensors.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Sensors.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Sensors.so.5.5.*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtTest.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtTest.so.4"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtTest.so.4.8*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Sql.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Sql.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Sql.so.5.5*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtDBus.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtDBus.so.4"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtDBus.so.4.8*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Svg.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Svg.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Svg.so.5.5*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtWebKit.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtWebKit.so.4"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtWebKit.so.4.9*[^g]" # Qt4.8's webkit is named 4.9

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Test.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Test.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Test.so.5.5*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtOpenGL.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtOpenGL.so.4"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQtOpenGL.so.4.8*[^g]"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebChannel.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebChannel.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebChannel.so.5.5.*[^g]"



#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineCore.so"

#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineCore.so.5"

#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineCore.so.5.5.*[^g]"



#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngine.so"

#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngine.so.5"

#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngine.so.5.5.*[^g]"



THIRDPARTYLIBS     += "$(ISIS3LOCAL)/lib/libQt5WebKit.so"

THIRDPARTYLIBS     += "$(ISIS3LOCAL)/lib/libQt5WebKit.so.5"

THIRDPARTYLIBS     += "$(ISIS3LOCAL)/lib/libQt5WebKit.so.5.5.*[^g]"



THIRDPARTYLIBS     += "$(ISIS3LOCAL)/lib/libQt5WebKitWidgets.so"

THIRDPARTYLIBS     += "$(ISIS3LOCAL)/lib/libQt5WebKitWidgets.so.5"

THIRDPARTYLIBS     += "$(ISIS3LOCAL)/lib/libQt5WebKitWidgets.so.5.5.*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Widgets.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Widgets.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Widgets.so.5.5*[^g]"



#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineWidgets.so"

#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineWidgets.so.5"

#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5WebEngineWidgets.so.5.5*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Xml.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Xml.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Xml.so.5.5*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5XmlPatterns.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5XmlPatterns.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5XmlPatterns.so.5.5*[^g]"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libqwt.so*"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libprotobuf.so*"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libgeos-*.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libgeos_c.so*"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libdsklib.so*"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libdsk.so*"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libcspice.so*"



#THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libcwd_r.so*"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libcolamd.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libccolamd.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libamd.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libcamd.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libcholmod.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libsuitesparseconfig.so"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/liblapack.so"

THIRDPARTYLIBS    += "$(ISIS3SYSLIB)/libblas*.so*"

THIRDPARTYLIBS    += "$(ISIS3ALTSYSLIB)/libgfortran.so*"

isis/make/isismake.os

+1 −15
Original line number Diff line number Diff line
@@ -63,27 +63,13 @@ ifndef ISISCPPFLAGS 
endif





# Set up Xalan's command-line option names. Some version of Xalan use different

# option names (e.g. Ubuntu's and Debian's Xalan).

# Set up Xalan's command-line option names. 

XALAN_VALIDATE_OPTION := -v

XALAN_OUTFILE_OPTION := -o

XALAN_PARAM_OPTION := -p

XALAN_INFILE_OPTION :=

XALAN_XSL_OPTION :=



# Ubuntu and Debian have a different executable name for Xalan, and it also

# does not accept the same command-line argument names as the version of Xalan

# available on the other systems. So, set up some variables to match the

# argument names that this version of Xalan is expecting.

ifneq "$(or $(findstring Ubuntu10_04, $(HOST_OS)), $(findstring Debian, $(HOST_OS)))" ""

  XALAN := xalan

  XALAN_VALIDATE_OPTION := -validate

  XALAN_OUTFILE_OPTION := -out

  XALAN_PARAM_OPTION := -param

  XALAN_INFILE_OPTION := -in

  XALAN_XSL_OPTION := -xsl

endif



ifneq "$(or $(findstring Fedora, $(HOST_OS)), $(findstring ScientificLinux, $(HOST_OS)))" ""

  XALAN = $(ISIS3LOCAL)/bin/Xalan

endif

isis/src/apollo/apps/apollopaninit/apollopaninit.cpp

+2 −2
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ void IsisMain() { 
  cidfrm_c(301, sizeof(frameName), &frameCode, frameName, &found);  

  if(!found) {

    QString naifTarget = QString("IAU_MOOM");

    namfrm_c(naifTarget.toAscii().data(), &frameCode);

    namfrm_c(naifTarget.toLatin1().data(), &frameCode);

    if(frameCode == 0) {

      QString msg = "Can not find NAIF code for [" + naifTarget + "]";

      throw IException(IException::Io, msg, _FILEINFO_);
@@ -822,7 +822,7 @@ void Load_Kernel(Isis::PvlKeyword &key) { 
       throw IException(IException::Io, msg, _FILEINFO_);

     }

     QString fileName(file.expanded());

     furnsh_c(fileName.toAscii().data());

     furnsh_c(fileName.toLatin1().data());

  }



  NaifStatus::CheckErrors();

isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.cpp

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ namespace Isis { 
    shuttertimes.second = time + (exposureDuration / 2.0);

    return shuttertimes;

  }



} // End Apollo namespace