Commit bcb4f590 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Merged trunk r7947 through r8003. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@8004 41f8697f-d340-4b68-9986-7bafba869bb8
parent 9bb787ce

isis/3rdParty/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ libs: 
	if [ "$(HOST_ARCH)" == "Darwin" ]; then                              \

	  chmod u+w $(ISISROOT)/3rdParty/lib/libcrypto.*.dylib;              \

	  chmod u+w $(ISISROOT)/3rdParty/lib/libssl.*.dylib;                 \

	  chmod u+w $(ISISROOT)/3rdParty/lib/Python.framework/Versions/3.5/Python;\

	  $(ISISROOT)/scripts/SetRunTimePath --libs                          \

	    --libmap=$(ISISROOT)/scripts/darwin_lib_paths.lis                \

	    --liblog=DarwinLibs.lis --update                                 \
@@ -59,8 +60,16 @@ libs: 
             --update                                                        \

	    `find $(ISISROOT)/3rdParty/lib -name '[Qq]*' -print              \

	    -mindepth 3 -maxdepth 4 -type f` > /dev/null;                    \

	  $(ISISROOT)/scripts/SetRunTimePath --bins                          \

	     --libmap=$(ISISROOT)/scripts/darwin_bin_paths.lis               \

             --liblog=DarwinLibs.lis                                         \

	     --relocdir=$(ISISROOT)/3rdParty/lib:$ISISROOT/3rdParty          \

             --update                                                        \

	    `find $(ISISROOT)/3rdParty/lib/Python.framework/Versions/3.5     \

	    -name 'Python' -print -type f` > /dev/null;                      \

	  chmod u-w $(ISISROOT)/3rdParty/lib/libcrypto.*.dylib;              \

	  chmod u-w $(ISISROOT)/3rdParty/lib/libssl.*.dylib;                 \

	  chmod u-w $(ISISROOT)/3rdParty/lib/Python.framework/Versions/3.5/Python;\

	  if [ -f "DarwinErrors.lis" ]; then                                 \

	    cat DarwinErrors.lis;                                            \

	  fi;                                                                \

isis/make/config.darwin-MacOSX10_11

+75 −2
Original line number Diff line number Diff line
@@ -317,7 +317,14 @@ ISISCPPFLAGS += -DENABLEJP2K=$(JP2KFLAG) 
#---------------------------------------------------------------------------

BOOSTINCDIR = "-isystem $(ISIS3OPT)/include"

BOOSTLIBDIR = -L$(ISIS3OPT)/lib

BOOSTLIB    =

BOOSTLIB    = -lboost_date_time-mt -lboost_filesystem-mt -lboost_graph-mt \

              -lboost_math_c99f-mt -lboost_math_c99l-mt -lboost_math_c99-mt \

              -lboost_math_tr1f-mt -lboost_math_tr1l-mt -lboost_math_tr1-mt \

              -lboost_prg_exec_monitor-mt -lboost_program_options-mt \

              -lboost_regex-mt -lboost_serialization-mt -lboost_signals-mt \

              -lboost_system-mt -lboost_thread-mt -lboost_unit_test_framework-mt \

              -lboost_wave-mt -lboost_wserialization-mt -lboost_timer-mt \

              -lboost_chrono-mt



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

# Set up for Cholmod Libraries
@@ -364,6 +371,44 @@ NNINCDIR = -I$(ISIS3LOCAL)/include/nn 
#NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIB = -lnn



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

# Setup for Bullet Physics library

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

#BULLETLIB     = -lBullet2FileLoader -lBullet3Collision -lBullet3Common          \

#                -lBullet3Dynamics   -lBullet3Geometry  -lBullet3OpenCL_clew     \

#                -lBulletCollision   -lBulletDynamics   -lBulletInverseDynamics  \

#                -lBulletSoftBody    -lLinearMath

BULLETLIB     = -lBullet3OpenCL_clew     -lBullet3Common    -lBullet3Geometry   \

                -lBulletSoftBody         -lBulletDynamics   -lBullet3Dynamics   \

                -lBulletInverseDynamics  -lBulletCollision  -lBullet3Collision  \

                -lLinearMath 

BULLETINCDIR  = -I$(ISIS3LOCAL)/include/bullet

BULLETLIBDIR  = -L$(ISIS3LOCAL)/lib



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

# Set up for PCL Python framework

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

PCLPYDIR      = $(ISIS3OPT)

PCLPYFRAMES   = $(PCLPYDIR)/Library/Frameworks

ifeq (,$(findstring $(PCLPYFRAMES)/Python.framework,$(wildcard $(PCLPYFRAMES)/Python.framework )))

  PCLPYFRAMES  = $(ISIS3OPT)/lib

endif



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

# Set up for PCL libraries 

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

PCLINCDIR = -I$(ISIS3LOCAL)/include/pcl-1.8

PCLLIBDIR = -L$(ISIS3LOCAL)/lib

PCLLIB    = -lpcl_common -lpcl_octree -lpcl_io                                \

            -framework Python -lintl

VTKLIB    = -lvtksys-7.0.1

EMBREELIB = -lembree



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

# Set up for Eigen (link to include files only, no library) 

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

EIGENINCDIR = -I$(ISIS3OPT)/include/eigen3



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

# Final generic setup for includes at the top level

#---------------------------------------------------------------------------
@@ -373,7 +418,7 @@ DEFAULTINCDIR = -I$(ISIS3LOCAL)/include 
#  Define the third party distribution libraries (patterns)

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



#  Libraries

# Qt Libraries

THIRDPARTYLIBS    += "$(QTFRAMEWORKDIR)/QtXmlPatterns.framework"

THIRDPARTYLIBS    += "$(QTFRAMEWORKDIR)/QtXml.framework"

THIRDPARTYLIBS    += "$(QTFRAMEWORKDIR)/QtNetwork.framework"
@@ -526,5 +571,33 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libicudata*.dylib" 
# libgeotiff depends on these libraries

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



# Bullet Libraries

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

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

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

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

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

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

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

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

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

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

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



# Add the Point Cloud Libraries and PCL dependencies

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

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

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

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

THIRDPARTYLIBS    += "$(PCLPYFRAMES)/Python.framework"



# Add the Embree library

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

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



# Add the Boost libraries

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

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



#  Plugins

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

isis/make/config.linux-x86_64

+87 −14
Original line number Diff line number Diff line
@@ -248,14 +248,13 @@ ISISCPPFLAGS += -DENABLEJP2K=$(JP2KFLAG) 
# Set up for BOOST

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

BOOSTINCDIR = -I$(ISIS3LOCAL)/include/boost/boost1.59.0

BOOSTLIBDIR =

BOOSTLIB    =

#BOOSTLIBDIR = -L$(ISIS3LOCAL)/lib

#BOOSTLIB    = -lboost_date_time -lboost_filesystem -lboost_graph -lboost_math_c99f \

#              -lboost_math_c99l -lboost_math_c99 -lboost_math_tr1f -lboost_math_tr1l \

#              -lboost_math_tr1 -lboost_prg_exec_monitor -lboost_program_options \

#              -lboost_regex -lboost_serialization -lboost_signals -lboost_system \

#              -lboost_thread -lboost_unit_test_framework -lboost_wave -lboost_wserialization

BOOSTLIBDIR = -L$(ISIS3LOCAL)/lib

BOOSTLIB    = -lboost_date_time -lboost_filesystem -lboost_graph -lboost_math_c99f \

              -lboost_math_c99l -lboost_math_c99 -lboost_math_tr1f -lboost_math_tr1l \

              -lboost_math_tr1 -lboost_prg_exec_monitor -lboost_program_options \

              -lboost_regex -lboost_serialization -lboost_signals -lboost_system \

              -lboost_thread -lboost_unit_test_framework -lboost_wave -lboost_wserialization \

              -lboost_timer -lboost_chrono



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

# Set up for Cholmod libraries
@@ -271,6 +270,42 @@ HDF5INCDIR = -I$(ISIS3LOCAL)/include/hdf5 
HDF5LIBDIR = -L$(ISIS3LOCAL)/lib

HDF5LIB    = -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp



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

# Set up for PCL libraries

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

PCLINCDIR = -I$(ISIS3LOCAL)/include/pcl-1.8

PCLLIBDIR = -L$(ISIS3LOCAL)/lib

PCLLIB    = -lpcl_common -lpcl_octree -lpcl_io



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

# Set up for Eigen (link to include files only, no library)

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

EIGENINCDIR = -I$(ISIS3LOCAL)/include/eigen



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

# Set up for VTK

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

VTKINCDIR = -I$(ISIS3LOCAL)/include/vtk-7.1

VTKLIBDIR = -L$(ISIS3LOCAL)/lib

VTKLIB    = -lvtksys-7.1



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

# Set up for FLANN

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

FLANNINCDIR = -I$(ISIS3LOCAL)/include/flann



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

# Set up for QHull

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

QHULLINCDIR = -I$(ISIS3LOCAL)/include/qhull



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

# Set up for Embree libraries 

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

EMBREEINCDIR = -I$(ISIS3LOCAL)/include/embree2

EMBREELIBDIR = -L$(ISIS3LOCAL)/lib

EMBREELIB    = -lembree



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

# Set up for OpenCV libraries 

#
@@ -303,6 +338,20 @@ NNINCDIR = -I$(ISIS3LOCAL)/include/nn 
#NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIB = -lnn



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

# Setup for Bullet Physics library

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

#BULLETLIB     = -lBullet3Collision  -lBullet3Common          \

#                -lBullet3Dynamics   -lBullet3Geometry  -lBullet3OpenCL_clew     \

#                -lBulletCollision   -lBulletDynamics   -lBulletInverseDynamics  \

#                -lBulletSoftBody    -lLinearMath 

BULLETLIB     = -lBullet3OpenCL_clew     -lBullet3Common    -lBullet3Geometry   \

                -lBulletSoftBody         -lBulletDynamics   -lBullet3Dynamics   \

                -lBulletInverseDynamics  -lBulletCollision  -lBullet3Collision  \

                -lLinearMath 

BULLETINCDIR  = -I$(ISIS3LOCAL)/include/bullet

BULLETLIBDIR  = -L$(ISIS3LOCAL)/lib



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

# Final generic setup for includes at the top level

#---------------------------------------------------------------------------
@@ -312,7 +361,7 @@ DEFAULTINCDIR = -I$(ISIS3LOCAL)/include 
#  Define the third party distribution libraries (patterns)

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



#  Libraries

# Qt Libraries

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

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5.6.*[^g]"
@@ -438,10 +487,8 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libgsl*.so*" 
#THIRDPARTYLIBS    += "/lib64/libreadline.so*"

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



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

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

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

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

# HDF5 libraries

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



# Add all the OpenCV libraries

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libopencv_*.so*"
@@ -450,6 +497,32 @@ THIRDPARTYLIBS += $(wildcard $(ISIS3ALTSYSLIB)/libavcodec.so*) 
THIRDPARTYLIBS    += $(wildcard $(ISIS3ALTSYSLIB)/libavformat.so*)

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



# Bullet Libraries

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

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

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

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

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

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

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

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

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

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

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





# Add the Point Cloud Libraries and PCL dependencies

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

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

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

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



# Add the Embree library

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

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



# Add the Boost libraries

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



#  Plugins

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

isis/make/config.linux-x86_64_Debian8

+86 −14
Original line number Diff line number Diff line
@@ -246,14 +246,13 @@ ISISCPPFLAGS += -DENABLEJP2K=$(JP2KFLAG) 
# Set up for BOOST

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

BOOSTINCDIR = -I$(ISIS3LOCAL)/include/boost/boost1.59.0

BOOSTLIBDIR =

BOOSTLIB    =

#BOOSTLIBDIR = -L$(ISIS3LOCAL)/lib

#BOOSTLIB    = -lboost_date_time -lboost_filesystem -lboost_graph -lboost_math_c99f \

#              -lboost_math_c99l -lboost_math_c99 -lboost_math_tr1f -lboost_math_tr1l \

#              -lboost_math_tr1 -lboost_prg_exec_monitor -lboost_program_options \

#              -lboost_regex -lboost_serialization -lboost_signals -lboost_system \

#              -lboost_thread -lboost_unit_test_framework -lboost_wave -lboost_wserialization

BOOSTLIBDIR = -L$(ISIS3LOCAL)/lib

BOOSTLIB    = -lboost_date_time -lboost_filesystem -lboost_graph -lboost_math_c99f \

              -lboost_math_c99l -lboost_math_c99 -lboost_math_tr1f -lboost_math_tr1l \

              -lboost_math_tr1 -lboost_prg_exec_monitor -lboost_program_options \

              -lboost_regex -lboost_serialization -lboost_signals -lboost_system \

              -lboost_thread -lboost_unit_test_framework -lboost_wave -lboost_wserialization \

              -lboost_timer -lboost_chrono



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

# Set up for Cholmod libraries
@@ -269,6 +268,42 @@ HDF5INCDIR = -I$(ISIS3LOCAL)/include/hdf5 
HDF5LIBDIR = -L$(ISIS3LOCAL)/lib

HDF5LIB    = -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp



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

# Set up for PCL libraries

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

PCLINCDIR = -I$(ISIS3LOCAL)/include/pcl-1.8

PCLLIBDIR = -L$(ISIS3LOCAL)/lib

PCLLIB    = -lpcl_common -lpcl_octree -lpcl_io



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

# Set up for Eigen (link to include files only, no library)

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

EIGENINCDIR = -I$(ISIS3LOCAL)/include/eigen



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

# Set up for VTK

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

VTKINCDIR = -I$(ISIS3LOCAL)/include/vtk-7.1

VTKLIBDIR = -L$(ISIS3LOCAL)/lib

VTKLIB    = -lvtksys-7.1



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

# Set up for FLANN

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

FLANNINCDIR = -I$(ISIS3LOCAL)/include/flann



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

# Set up for QHull

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

QHULLINCDIR = -I$(ISIS3LOCAL)/include/qhull



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

# Set up for Embree libraries 

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

EMBREEINCDIR = -I$(ISIS3LOCAL)/include/embree2

EMBREELIBDIR = -L$(ISIS3LOCAL)/lib

EMBREELIB    = -lembree



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

# Set up for OpenCV libraries

#
@@ -301,6 +336,19 @@ NNINCDIR = -I$(ISIS3LOCAL)/include/nn 
#NNLIBDIR = -L$(ISIS3LOCAL)/lib

NNLIB = -lnn



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

# Setup for Bullet Physics library

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

#BULLETLIB     = -lBullet2FileLoader -lBullet3Collision -lBullet3Common          \

#                -lBullet3Dynamics   -lBullet3Geometry  -lBullet3OpenCL_clew     \

#                -lBulletCollision   -lBulletDynamics   -lBulletInverseDynamics  \

#                -lBulletSoftBody    -lLinearMath

BULLETLIB     = -lBullet3OpenCL_clew     -lBullet3Common    -lBullet3Geometry   \

                -lBulletSoftBody         -lBulletDynamics   -lBullet3Dynamics   \

                -lBulletInverseDynamics  -lBulletCollision  -lBullet3Collision  \

                -lLinearMath 

BULLETINCDIR  = -I$(ISIS3LOCAL)/include/bullet



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

# Final generic setup for includes at the top level

#---------------------------------------------------------------------------
@@ -310,7 +358,7 @@ DEFAULTINCDIR = -I$(ISIS3LOCAL)/include 
#  Define the third party distribution libraries (patterns)

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



#  Libraries

# Qt Libraries

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

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5"

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libQt5Concurrent.so.5.6.*[^g]"
@@ -436,10 +484,8 @@ THIRDPARTYLIBS += "$(ISIS3LOCAL)/lib/libgsl*.so*" 
#THIRDPARTYLIBS    += "/lib64/libreadline.so*"

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



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

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

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

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

# HDF5 libraries

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



# Add all the OpenCV libraries

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libopencv_*.so*"
@@ -448,10 +494,36 @@ THIRDPARTYLIBS += $(wildcard $(ISIS3ALTSYSLIB)/libavcodec.so*) 
THIRDPARTYLIBS    += $(wildcard $(ISIS3ALTSYSLIB)/libavformat.so*)

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



# Bullet Libraries

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

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

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

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

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

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

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

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

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

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

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



# Add the Point Cloud Libraries and PCL dependencies

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

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

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

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



# Add the Embree library

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

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



# Add the Boost libraries

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



# Add system libraries that need their rpath's patched to $ORIGIN

PATCHLIBS += "$(ISIS3SYSLIB)/libsnappy.so*" # Qt5WebEngine dependency

PATCHLIBS += "$(ISIS3SYSLIB)/libsrtp.so*"   # Qt5WebEngine dependency



PATCHLIBS += "$(ISIS3LOCAL)/lib/libvtksys*.so*"



#  Plugins

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

isis/make/config.linux-x86_64_Ubuntu14_04

+82 −14

File changed.

Preview size limit exceeded, changes collapsed.