Commit 9179842a authored by Stuart Sides's avatar Stuart Sides
Browse files

PROG new make files for opencv 

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

isis/make/config.darwin-MacOSX10_6

+3 −3
Original line number Diff line number Diff line
@@ -289,8 +289,8 @@ CHOLMODLIB = -lcholmod -lamd -lcolamd -framework Accelerate 
# Set up for OpenCV libraries 

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

OPENCVINCDIR =  -I$(ISIS3OPT)/include

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

OPENCVLIBS   = -lopencv_calib3d -lopencv_contrib -lopencv_core -lopencv_features2d \

OPENCVLIBDIR =  -L$(ISIS3OPT)/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 \
@@ -300,7 +300,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



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

isis/make/config.darwin-MacOSX10_8

+3 −3
Original line number Diff line number Diff line
@@ -292,8 +292,8 @@ CHOLMODLIB = -lcholmod -lamd -lcolamd -lcamd -framework Accelerate 
# Set up for OpenCV libraries 

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

OPENCVINCDIR =  -I$(ISIS3OPT)/include

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

OPENCVLIBS   = -lopencv_calib3d -lopencv_contrib -lopencv_core -lopencv_features2d \

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

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 \
@@ -303,7 +303,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



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

isis/make/config.linux-x86_64

+2 −8
Original line number Diff line number Diff line
@@ -248,8 +248,6 @@ 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



#---------------------------------------------------------------------------
@@ -260,7 +258,7 @@ HDF5LIB = -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp 
#---------------------------------------------------------------------------

OPENCVINCDIR =  -I$(ISIS3LOCAL)/include

OPENCVLIBDIR =  -L$(ISIS3LOCAL)/lib

OPENCVLIBS   = -lopencv_calib3d -lopencv_contrib -lopencv_core -lopencv_features2d \

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 \
@@ -278,7 +276,7 @@ OPENCVLIBS = -lopencv_calib3d -lopencv_contrib -lopencv_core -lopencv_features 
# on a new line.

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

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

#NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIB = -lnn



#---------------------------------------------------------------------------
@@ -368,10 +366,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*"

isis/make/isismake.os

+4 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ ALLLIBDIRS += $(KAKADULIBDIR) 
ALLLIBDIRS += $(CHOLMODLIBDIR)

ALLLIBDIRS += $(HDF5LIBDIR)

ALLLIBDIRS += $(SUPERLULIBDIR)

ALLLIBDIRS += $(OPENCVLIBDIR)

ALLLIBDIRS += $(NNLIBDIR)



ALLLIBS  = $(ISISLIB) 

ifeq ($(findstring STATIC, $(MODE)),STATIC)
@@ -169,4 +171,6 @@ ALLLIBS += $(KAKADULIB) 
ALLLIBS += $(CHOLMODLIB)

ALLLIBS += $(HDF5LIB)

ALLLIBS += $(SUPERLULIB)

ALLLIBS += $(OPENCVLIB)

ALLLIBS += $(NNLIB)

isis/src/control/apps/findfeatures/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -5,8 +5,3 @@ error: 
else

	include $(ISISROOT)/make/isismake.apps

endif
 


# Since opencv include path and libs are not in isismake.os

# (so all apps don't link against the large opencv libraries)

# we need to make sure those are added here:

ALLLIBS += $(OPENCVLIBS)
 
 No newline at end of file