Commit 660f341a authored by Adam Goins's avatar Adam Goins
Browse files

Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into Goins_Adam_M05361

parents 8e6fbd92 e70d885c

.gitignore

+2 −1
Original line number Diff line number Diff line
@@ -27,10 +27,11 @@ object_script.*.Debug 
*_plugin_import.cpp

*.moc

ui_*.h

*.html

*html



# ignore all files created by squish coco

*csmes

*csexe



print.prt

isis/make/config.linux-x86_64

+3 −0
Original line number Diff line number Diff line
@@ -526,5 +526,8 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libtbb*.so*" 
# Add the Boost libraries

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



# Add srtp deps (Qt5WebEngine deps) -- see #5365

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



#  Plugins

THIRDPARTYPLUGINS += "$(ISIS3LOCAL)/plugins/"

isis/make/config.linux-x86_64_Fedora25

+4 −1
Original line number Diff line number Diff line
@@ -479,7 +479,6 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libsuperlu*.so" 
THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libsuitesparseconfig.so"

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

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

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

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

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

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libtiff*.so*"
@@ -533,5 +532,9 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libtbb*.so*" 
# Add the Boost libraries

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



# Add and patch the gfortran's rpath to $ORIGIN (so it can find its quadmath dependency) -- #4610

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

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



#  Plugins

THIRDPARTYPLUGINS += "$(ISIS3LOCAL)/plugins/"

isis/src/base/apps/fits2isis/tsts/default/Makefile

+3 −7
Original line number Diff line number Diff line
@@ -4,10 +4,6 @@ include $(ISISROOT)/make/isismake.tsts 


commands:

	$(APPNAME) from=$(INPUT)/WFPC2u5780205r_c0fx.fits \

	to=$(OUTPUT)/fitsTruth.cub \

	> /dev/null;

	raw2isis from=$(INPUT)/WFPC2u5780205r_c0fx.fits \

	to=$(OUTPUT)/rawTruth.cub \

	SAMPLES=200 LINES=200 BANDS=4 SKIP=23040 \

	BITTYPE=REAL BYTEORDER=MSB \

	> /dev/null;
 
	  to=$(OUTPUT)/fitsTruth.cub > /dev/null;

	catlab from=$(OUTPUT)/fitsTruth.cub \

		to=$(OUTPUT)/fitsTruth.pvl > /dev/null;

isis/src/base/apps/fits2isis/tsts/organization/Makefile

+6 −4
Original line number Diff line number Diff line
@@ -4,8 +4,10 @@ include $(ISISROOT)/make/isismake.tsts 


commands:

	$(APPNAME) from=$(INPUT)/lsb_0034933739_0x53c_sci_1.fit \

	to=$(OUTPUT)/bilTruth.cub organization=bil imagenumber=1\

	> /dev/null;

		to=$(OUTPUT)/bilTruth.cub organization=bil imagenumber=1 > /dev/null;

	catlab from=$(OUTPUT)/bilTruth.cub \

		to=$(OUTPUT)/bilTruth.pvl > /dev/null;

	$(APPNAME) from=$(INPUT)/lsb_0034933739_0x53c_sci_1.fit \

	to=$(OUTPUT)/bsqTruth.cub organization=bsq imagenumber=1 \

	> /dev/null;
 
		to=$(OUTPUT)/bsqTruth.cub organization=bsq imagenumber=1 > /dev/null;

	catlab from=$(OUTPUT)/bsqTruth.cub \

		to=$(OUTPUT)/bsqTruth.pvl > /dev/null;