Commit 63a4416a authored by Stuart Sides's avatar Stuart Sides
Browse files

PROG new make files for opencv Fedora version 

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

isis/make/config.linux-x86_64_Fedora21

+3 −9
Original line number Diff line number Diff line
@@ -254,16 +254,14 @@ CHOLMODLIB = -lcholmod -lamd -lcolamd -llapack 
#---------------------------------------------------------------------------

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



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

# Set up for OpenCV libraries 

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

OPENCVINCDIR =  -I$(ISIS3LOCAL)/include

#OPENCVLIBDIR =  -L$(ISIS3LOCAL)/lib   # Redundant

OPENCVLIBS   = -lopencv_calib3d -lopencv_contrib -lopencv_core -lopencv_features2d \

OPENCVLIBDIR =  -L$(ISIS3LOCAL)/lib

OPENCVLIB   = -lopencv_calib3d -lopencv_contrib -lopencv_core -lopencv_features2d \

              -lopencv_flann -lopencv_gpu -lopencv_highgui -lopencv_imgproc \

              -lopencv_legacy -lopencv_ml -lopencv_nonfree -lopencv_objdetect \

              -lopencv_photo -lopencv_stitching -lopencv_superres -lopencv_ts \
@@ -273,7 +271,7 @@ OPENCVLIBS = -lopencv_calib3d -lopencv_contrib -lopencv_core -lopencv_features 
# Set up for Natural Neigbor Library (NN)

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

NNINCDIR = -I$(ISIS3LOCAL)/include/nn

#NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIB = -lnn



#---------------------------------------------------------------------------
@@ -363,10 +361,6 @@ 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*"



# Add all the OpenCV libraries

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