Commit 79135929 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

Added hdf5 library to linux 64 bit builds. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@6062 41f8697f-d340-4b68-9986-7bafba869bb8
parent 5be6e377

isis/make/config.linux-x86_64

+17 −1
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/HDF51-1.8.14

# 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)

#---------------------------------------------------------------------------
@@ -317,6 +326,13 @@ THIRDPARTYLIBS += "$(ISIS3SYSLIB)/libgsl*.so*" 
#THIRDPARTYLIBS    += "$(ISIS3SYSLIB)/libcrypto.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
@@ -124,6 +124,7 @@ ALLINCDIRS += $(PROTOBUFINCDIR) 
ALLINCDIRS += $(BOOSTINCDIR)

ALLINCDIRS += $(KAKADUINCDIR)

ALLINCDIRS += $(CHOLMODINCDIR)

ALLINCDIRS += $(HDF5INCDIR)

ALLINCDIRS += $(SUPERLUINCDIR)



ALLLIBDIRS  = -L.
@@ -144,6 +145,7 @@ ALLLIBDIRS += $(PROTOBUFLIBDIR) 
ALLLIBDIRS += $(BOOSTLIBDIR)

ALLLIBDIRS += $(KAKADULIBDIR)

ALLLIBDIRS += $(CHOLMODLIBDIR)

ALLLIBDIRS += $(HDF5LIBDIR)

ALLLIBDIRS += $(SUPERLULIBDIR)



ALLLIBS  = $(ISISLIB)
@@ -168,6 +170,7 @@ ALLLIBS += $(PROTOBUFLIB) 
ALLLIBS += $(BOOSTLIB)

ALLLIBS += $(KAKADULIB)

ALLLIBS += $(CHOLMODLIB)

ALLLIBS += $(HDF5LIB)

ALLLIBS += $(SUPERLULIB)



include $(ISISROOT)/make/isismake.utils