Commit cc454d8e authored by Kris Becker's avatar Kris Becker
Browse files

Updated MacOSX and Linux build config files to fix dependency issues for OpenCV. Fixes #3881. 

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

isis/make/config.darwin-MacOSX10_8

+3 −1
Original line number Diff line number Diff line
@@ -373,7 +373,6 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libavutil*.dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libswscale*.dylib"



# Secondary requirements to all OpenCV dependancies (Yuck!)

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

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libSDL-1*.dylib"

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

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libhogweed*.dylib"
@@ -410,6 +409,9 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libfontconfig*.dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libenca*.dylib"

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

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

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

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/libp11-kit*.dylib"

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

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

isis/make/config.linux-x86_64

+4 −0
Original line number Diff line number Diff line
@@ -369,6 +369,10 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libhdf5_hl_cpp.so*" 
# Add all the OpenCV libraries

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

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

THIRDPARTYLIBS    += $(wildcard $(ISIS3ALTSYSLIB)/libavcodec.so*)

THIRDPARTYLIBS    += $(wildcard $(ISIS3ALTSYSLIB)/libavformat.so*)

THIRDPARTYLIBS    += $(wildcard $(ISIS3ALTSYSLIB)/libavutil.so*)





#  Plugins

THIRDPARTYPLUGINS += "$(ISIS3LOCAL)/plugins/"

isis/make/config.linux-x86_64_Fedora21

+4 −0
Original line number Diff line number Diff line
@@ -364,6 +364,10 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libhdf5_hl_cpp.so*" 
# Add all the OpenCV libraries

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

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

THIRDPARTYLIBS    += $(wildcard $(ISIS3ALTSYSLIB)/libavcodec.so*)

THIRDPARTYLIBS    += $(wildcard $(ISIS3ALTSYSLIB)/libavformat.so*)

THIRDPARTYLIBS    += $(wildcard $(ISIS3ALTSYSLIB)/libavutil.so*)





#  Plugins

THIRDPARTYPLUGINS += "$(ISIS3LOCAL)/plugins/"