Commit f0e26f08 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

PROG: Installed natural neighbor (nn) on systems, added opencv and nn... 

PROG: Installed natural neighbor (nn) on systems, added opencv and nn libraries to config files. Fixes #2396.

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

isis/make/config.darwin-10.5

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

CHOLMODLIB   = -lcholmod -lamd -lcolamd -framework Accelerate



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

# Set up for OpenCV libraries 

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

OPENCVINCDIR =  -I$(ISIS3LOCAL)/include

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

OPENCVLIBS   = -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 \

               -lopencv_video -lopencv_videostab



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

# Set up for Natural Neigbor Library (NN)

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

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

#NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIB = -lnn



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

# Final generic setip for includes at the top level

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

DEFAULTINCDIR =  -I$(ISIS3LOCAL)/include



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

#  Define the third party distribution libraries (patterns)

#---------------------------------------------------------------------------
@@ -276,6 +299,11 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libcholmod.dylib" 
THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libcolamd.dylib"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libufconfig.dylib"

THIRDPARTYLIBS    += "/System/Library/Frameworks/Accelerate.framework"

# Add all the OpenCV libraries

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

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libtbb*.dylib"



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



# libxerces-c depends on these libraries

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

isis/make/config.darwin-MacOSX10_10

+29 −0
Original line number Diff line number Diff line
@@ -287,6 +287,29 @@ CHOLMODINCDIR = -I$(ISIS3LOCAL)/include 
CHOLMODLIBDIR = -L$(ISIS3LOCAL)/lib

CHOLMODLIB   = -lcholmod -lamd -lcolamd -lcamd -framework Accelerate



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

# Set up for OpenCV libraries 

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

OPENCVINCDIR =  -I$(ISIS3OPT)/include

#OPENCVLIBDIR =  -L$(ISIS3OPT)/lib

OPENCVLIBS   = -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 \

               -lopencv_video -lopencv_videostab



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

# Set up for Natural Neigbor Library (NN)

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

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

#NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIB = -lnn



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

# Final generic setip for includes at the top level

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

DEFAULTINCDIR =  -I$(ISIS3LOCAL)/include



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

#  Define the third party distribution libraries (patterns)

#---------------------------------------------------------------------------
@@ -333,6 +356,12 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libcholmod.dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libcolamd.dylib"

THIRDPARTYLIBS    += "/System/Library/Frameworks/Accelerate.framework"

 

# Add all the OpenCV libraries

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

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



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



# libxerces-c depends on these libraries

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

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

isis/make/config.darwin-MacOSX10_6

+30 −0
Original line number Diff line number Diff line
@@ -284,6 +284,30 @@ CHOLMODINCDIR = -I$(ISIS3LOCAL)/include 
CHOLMODLIBDIR = -L$(ISIS3LOCAL)/lib

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 \

               -lopencv_flann -lopencv_gpu -lopencv_highgui -lopencv_imgproc \

               -lopencv_legacy -lopencv_ml -lopencv_nonfree -lopencv_objdetect \

               -lopencv_photo -lopencv_stitching -lopencv_superres -lopencv_ts \

               -lopencv_video -lopencv_videostab



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

# Set up for Natural Neigbor Library (NN)

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

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

#NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIB = -lnn



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

# Final generic setup for includes at the top level

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

DEFAULTINCDIR =  -I$(ISIS3LOCAL)/include



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

#  Define the third party distribution libraries (patterns)

#---------------------------------------------------------------------------
@@ -329,6 +353,12 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libcholmod.dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libcolamd.dylib"

THIRDPARTYLIBS    += "/System/Library/Frameworks/Accelerate.framework"



# Add all the OpenCV libraries

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

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



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



# libxerces-c depends on these libraries

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

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

isis/make/config.darwin-MacOSX10_8

+31 −0
Original line number Diff line number Diff line
@@ -287,6 +287,31 @@ CHOLMODINCDIR = -I$(ISIS3LOCAL)/include 
CHOLMODLIBDIR = -L$(ISIS3LOCAL)/lib

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 \

               -lopencv_flann -lopencv_gpu -lopencv_highgui -lopencv_imgproc \

               -lopencv_legacy -lopencv_ml -lopencv_nonfree -lopencv_objdetect \

               -lopencv_photo -lopencv_stitching -lopencv_superres -lopencv_ts \

               -lopencv_video -lopencv_videostab



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

# Set up for Natural Neigbor Library (NN)

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

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

#NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIB = -lnn



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

# Final generic setup for includes at the top level

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

DEFAULTINCDIR =  -I$(ISIS3LOCAL)/include





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

#  Define the third party distribution libraries (patterns)

#---------------------------------------------------------------------------
@@ -333,6 +358,12 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libcholmod.dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libcolamd.dylib"

THIRDPARTYLIBS    += "/System/Library/Frameworks/Accelerate.framework"



# Add all the OpenCV libraries

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

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



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



# libxerces-c depends on these libraries

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

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

isis/make/config.linux-x86_32

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

CHOLMODLIB    = -lcholmod -lamd -lcolamd -llapack



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

# Set up for OpenCV libraries 

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

OPENCVINCDIR =  -I$(ISIS3LOCAL)/include

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

OPENCVLIBS   = -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 \

               -lopencv_video -lopencv_videostab



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

# Set up for Natural Neighbor library (NN)

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

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

#NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIB = -lnn



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

# Final generic setup for includes at the top level

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

DEFAULTINCDIR =  -I$(ISIS3LOCAL)/include



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

#  Define the third party distribution libraries (patterns)

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