Commit 0fa93f50 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

PROG: Added hdf library to config and make files. This change merged from IPCE branch. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6466 41f8697f-d340-4b68-9986-7bafba869bb8
parent d7b8364e

isis/make/config.linux-x86_64

+20 −0
Original line number Diff line number Diff line
@@ -243,6 +243,15 @@ CHOLMODINCDIR = -I$(ISIS3LOCAL)/include/CHOLMOD/CHOLMOD1.7.3 
CHOLMODLIBDIR = -L$(ISIS3LOCAL)/lib

CHOLMODLIB    = -lcholmod -lamd -lcolamd -llapack



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

# Set up for HDF5 libraries 

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

HDF5INCDIR = -I$(ISIS3LOCAL)/include/hdf5

HDF5LIBDIR = -L$(ISIS3LOCAL)/lib

# HDF5INCDIR = -I/work/projects/progteam/jlaura/hdf5-1.8.14/build/include

# HDF5LIBDIR = -L/work/projects/progteam/jlaura/hdf5-1.8.14/build/lib

HDF5LIB    = -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp



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

#  Define the third party distribution libraries (patterns)

#---------------------------------------------------------------------------
@@ -296,8 +305,10 @@ 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/libcspice.so*"



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libsuperlu_4.3.a"

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

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libcolamd.so"
@@ -319,5 +330,14 @@ THIRDPARTYLIBS += "$(ISIS3SYSLIB)/libgsl*.so*" 
#THIRDPARTYLIBS    += "/lib64/libreadline.so*"

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



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

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

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

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

#THIRDPARTYLIBS += "/work/projects/progteam/jlaura/hdf5-1.8.14/build/lib/libhdf5.so*"

#THIRDPARTYLIBS += "/work/projects/progteam/jlaura/hdf5-1.8.14/build/lib/libhdf5_hl.so*"

#THIRDPARTYLIBS += "/work/projects/progteam/jlaura/hdf5-1.8.14/build/lib/libhdf5_cpp.so*"

#THIRDPARTYLIBS += "/work/projects/progteam/jlaura/hdf5-1.8.14/build/lib/libhdf5_hl_cpp.so*"



#  Plugins

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

isis/make/config.linux-x86_64_Fedora21

+20 −0
Original line number Diff line number Diff line
@@ -249,6 +249,15 @@ CHOLMODINCDIR = -I$(ISIS3LOCAL)/include/CHOLMOD/CHOLMOD1.7.3 
CHOLMODLIBDIR = -L$(ISIS3LOCAL)/lib

CHOLMODLIB    = -lcholmod -lamd -lcolamd -llapack



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

# Set up for HDF5 libraries 

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

HDF5INCDIR = -I$(ISIS3LOCAL)/include/hdf5

HDF5LIBDIR = -L$(ISIS3LOCAL)/lib

# HDF5INCDIR = -I/work/projects/progteam/jlaura/hdf5-1.8.14/build/include

# HDF5LIBDIR = -L/work/projects/progteam/jlaura/hdf5-1.8.14/build/lib

HDF5LIB    = -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp



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

#  Define the third party distribution libraries (patterns)

#---------------------------------------------------------------------------
@@ -302,8 +311,10 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libqwt.so*" 
THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libprotobuf.so*"

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

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



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

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



THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libsuperlu_4.3.a"

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

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libcolamd.so"
@@ -325,5 +336,14 @@ THIRDPARTYLIBS += "$(ISIS3SYSLIB)/libgsl*.so*" 
#THIRDPARTYLIBS    += "/lib64/libreadline.so*"

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



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

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

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

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

#THIRDPARTYLIBS += "/work/projects/progteam/jlaura/hdf5-1.8.14/build/lib/libhdf5.so*"

#THIRDPARTYLIBS += "/work/projects/progteam/jlaura/hdf5-1.8.14/build/lib/libhdf5_hl.so*"

#THIRDPARTYLIBS += "/work/projects/progteam/jlaura/hdf5-1.8.14/build/lib/libhdf5_cpp.so*"

#THIRDPARTYLIBS += "/work/projects/progteam/jlaura/hdf5-1.8.14/build/lib/libhdf5_hl_cpp.so*"



#  Plugins

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

isis/make/isismake.os

+3 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ ALLINCDIRS += $(PROTOBUFINCDIR) 
ALLINCDIRS += $(BOOSTINCDIR)

ALLINCDIRS += $(KAKADUINCDIR)

ALLINCDIRS += $(CHOLMODINCDIR)

ALLINCDIRS += $(HDF5INCDIR)

ALLINCDIRS += $(SUPERLUINCDIR)



ALLLIBDIRS  = -L.
@@ -138,6 +139,7 @@ ALLLIBDIRS += $(PROTOBUFLIBDIR) 
ALLLIBDIRS += $(BOOSTLIBDIR)

ALLLIBDIRS += $(KAKADULIBDIR)

ALLLIBDIRS += $(CHOLMODLIBDIR)

ALLLIBDIRS += $(HDF5LIBDIR)

ALLLIBDIRS += $(SUPERLULIBDIR)



ALLLIBS  = $(ISISLIB)
@@ -162,5 +164,6 @@ ALLLIBS += $(PROTOBUFLIB) 
ALLLIBS += $(BOOSTLIB)

ALLLIBS += $(KAKADULIB)

ALLLIBS += $(CHOLMODLIB)

ALLLIBS += $(HDF5LIB)

ALLLIBS += $(SUPERLULIB)