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

PROG: Updated instructions for linking against opencv and nn libs. References #2396. 

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

isis/make/config.linux-x86_64

+3 −2
Original line number Diff line number Diff line
@@ -255,7 +255,8 @@ HDF5LIB = -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp 
#---------------------------------------------------------------------------

# Set up for OpenCV libraries 

#

# * See NN notes as OPENCVLIBS is not in isismake.os

# Add the following line to your app's Makefile (see the NN notes)

# ALLLIBS += $(OPENCVLIBS)

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

OPENCVINCDIR =  -I$(ISIS3LOCAL)/include

OPENCVLIBDIR =  -L$(ISIS3LOCAL)/lib
@@ -273,7 +274,7 @@ OPENCVLIBS = -lopencv_calib3d -lopencv_contrib -lopencv_core -lopencv_features 
#

# For now, if you want to use this library, modify your app's Makefile. 

# Add an empty line after the last line in the Makefile, then add

# ALLLIBDIRS += $(NNLIB)

# ALLLIBS += $(NNLIB)

# on a new line.

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

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

isis/make/isismake.os

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ ALLINCDIRS += $(KAKADUINCDIR) 
ALLINCDIRS += $(CHOLMODINCDIR)

ALLINCDIRS += $(HDF5INCDIR)

ALLINCDIRS += $(SUPERLUINCDIR)

ALLINCDIRS += $(OPENCVINCDIR)

ALLINCDIRS += $(NNINCDIR)

ALLINCDIRS += $(DEFAULTINCDIR)



ALLLIBDIRS  = -L.