Commit 7e802be6 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

hdf5 now explicitly configured in ISIS config files for prog14 and prog15. Fixes #2225. 

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

isis/make/config.darwin-MacOSX10_6

+12 −0
Original line number Diff line number Diff line
@@ -303,6 +303,13 @@ NNINCDIR = -I$(ISIS3LOCAL)/include/nn 
#NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIB = -lnn



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

# Set up for HDF5 libraries 

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

HDF5INCDIR = -I$(ISIS3OPT)/include

#HDF5LIBDIR = -L$(ISIS3LOCAL)/lib

HDF5LIB    = -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp



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

# Final generic setup for includes at the top level

#---------------------------------------------------------------------------
@@ -407,6 +414,11 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libexpat*.dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libintl*.dylib"

#THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/lib*.dylib"



# hdf5

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libhdf5*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libhdf5_hl*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libhdf5_cpp*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libhdf5_hl_cpp*.dylib"



# libxerces-c depends on these libraries

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libicui18n*.dylib"

isis/make/config.darwin-MacOSX10_8

+12 −0
Original line number Diff line number Diff line
@@ -306,6 +306,13 @@ NNINCDIR = -I$(ISIS3LOCAL)/include/nn 
#NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIB = -lnn



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

# Set up for HDF5 libraries 

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

HDF5INCDIR = -I$(ISIS3OPT)/include

#HDF5LIBDIR = -L$(ISIS3LOCAL)/lib

HDF5LIB    = -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp



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

# Final generic setup for includes at the top level

#---------------------------------------------------------------------------
@@ -414,6 +421,11 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libp11-kit*.dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libffi*.dylib"

#THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/lib*.dylib"



# hdf5

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libhdf5*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libhdf5_hl*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libhdf5_cpp*.dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libhdf5_hl_cpp*.dylib"



# libxerces-c depends on these libraries

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libicui18n*.dylib"