Commit a589c040 authored by Jesse Mapel's avatar Jesse Mapel
Browse files

Merged trunk 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/PiecewisePolynomials@8160 41f8697f-d340-4b68-9986-7bafba869bb8
parent fd604210

isis/3rdParty/Makefile

+13 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ include $(ISISROOT)/make/isismake.os 


all:  install



install: libs plugins

install: libs license plugins



#libs: license

libs:
@@ -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;                                                                \
@@ -69,7 +78,7 @@ libs: 


license:

	echo $(CURTIMESTAMP) "  Obtaining licenses";                         \

	$(RSYNC) -a /usgs/pkgs/local/$(ISISLOCALVERSION)/license/            \

	$(RSYNC) -a $(THIRDPARTYLICPATH)														         \

	  $(ISISROOT)/3rdParty/license/



plugins:

isis/IsisPreferences

+3 −1
Original line number Diff line number Diff line
@@ -163,9 +163,10 @@ Group = DataDirectory 
  Clementine1  = $ISIS3DATA/clementine1

  Control      = $ISIS3DATA/control

  Dawn         = $ISIS3DATA/dawn

  Tgo          = $ISIS3DATA/tgo

  Galileo      = $ISIS3DATA/galileo

  Hayabusa     = $ISIS3DATA/hayabusa

  Hayabusa2    = $ISIS3DATA/hayabusa2

  Juno         = $ISIS3DATA/juno

  Kaguya       = $ISIS3DATA/kaguya

  Lo           = $ISIS3DATA/lo

  Lro          = $ISIS3DATA/lro
@@ -182,6 +183,7 @@ Group = DataDirectory 
  Rolo         = $ISIS3DATA/rolo

  Rosetta      = $ISIS3DATA/rosetta

  Smart1       = $ISIS3DATA/smart1

  Tgo          = $ISIS3DATA/tgo

  Viking1      = $ISIS3DATA/viking1

  Viking2      = $ISIS3DATA/viking2

  Voyager1     = $ISIS3DATA/voyager1

isis/make/config.darwin-10.5

+13 −14
Original line number Diff line number Diff line
@@ -309,4 +309,3 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libicudata*.dylib" 


#  Plugins

THIRDPARTYPLUGINS +=  "$(ISIS3OPT)/libexec/qt4-mac/plugins/"

isis/make/config.darwin-MacOSX10_10

+16 −17
Original line number Diff line number Diff line
@@ -368,4 +368,3 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libproj*.dylib" 


#  Plugins

THIRDPARTYPLUGINS +=  "$(ISIS3OPT)/share/qt4/plugins/"

isis/make/config.darwin-MacOSX10_11

+86 −8
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ ISIS_MACOSX_TARGET=10.11 


ISIS_CFLAGS= -pipe -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk -Wall -W -Wno-unused-parameter -fPIC $(MAC_ARCH_FLAGS) $(QTDEFINES)



ISIS_CPPFLAGS= -pipe -stdlib=libc++ -std=gnu++11 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk -Wall -W -Wno-unused-parameter -fPIC $(MAC_ARCH_FLAGS) $(QTDEFINES)

ISIS_CPPFLAGS= -pipe -stdlib=libc++ -std=c++11 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk -Wall -W -Wno-unused-parameter -fPIC $(MAC_ARCH_FLAGS) $(QTDEFINES)



ISIS_LFLAGS=-headerpad_max_install_names -stdlib=libc++ -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk $(MAC_ARCH_FLAGS)
@@ -46,7 +46,6 @@ ISISCPPFLAGS += -DGMM_USES_SUPERLU 
#else

  ISISCPPFLAGS  += -O2

#endif



ISISCFLAGS = $(ISIS_CFLAGS)



#---------------------------------------------------------------------------
@@ -92,6 +91,9 @@ DOXYGEN = $(ISIS3OPT)/bin/doxygen 
DOT_PATH    = $(ISIS3OPT)/bin

GREP        = $(ISIS3OPT)/bin/grep



# Set up path for OS specific locations of 3rd party licenses

THIRDPARTYLICPATH := /opt/usgs/$(ISISLOCALVERSION)/3rdParty/license/



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

# Set up for cwd

#---------------------------------------------------------------------------
@@ -240,7 +242,7 @@ JAMALIB = 
#---------------------------------------------------------------------------

# Set up for GEOS

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

GEOSINCDIR = -I$(ISIS3OPT)/include/geos

GEOSINCDIR = -isystem $(ISIS3OPT)/include/geos

GEOSLIBDIR = -L$(ISIS3OPT)/lib

GEOSLIB    = -lgeos -lgeos_c
@@ -302,9 +304,9 @@ PROTOC = $(ISIS3OPT)/bin/protoc 
#  below (i.e., be sure to add -I, -L and -l to the variables for KAKADUINCDIR,

#  KAKADULIBDIR and KAKADULIB, respectively).

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

KAKADUINCDIR := "-isystem$(ISIS3PROP)/include/kakadu/v6_3-00967N/"

KAKADUINCDIR := "-isystem$(ISIS3PROP)/include/kakadu/v7_9_1-01762L"

KAKADULIBDIR := -L$(ISIS3PROP)/lib

KAKADULIB    := -lkdu_a63R

KAKADULIB    := -lkdu_a79R -lkdu_v79R

#  Strip -I from Kakadu include directory macro and check for existance

JP2KFLAG ?= $(shell if [ -d $(subst -isystem,,$(KAKADUINCDIR)) ]; then echo "1"; else echo "0"; fi;)

ISISCPPFLAGS += -DENABLEJP2K=$(JP2KFLAG)
@@ -314,7 +316,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
@@ -361,6 +370,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

#---------------------------------------------------------------------------
@@ -370,7 +417,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"
@@ -438,7 +485,10 @@ THIRDPARTYLIBS += "$(ISIS3OPT)/lib/libsqlite3.*dylib" 
THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/postgresql*/libpq.*dylib"

THIRDPARTYLIBS    += "$(ISIS3OPT)/lib/mysql56/mysql/libmysqlclient*.dylib"

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

THIRDPARTYLIBS    += "$(ISIS3PROP)/lib/libkdu_a63R.dylib"

THIRDPARTYLIBS    += "$(ISIS3PROP)/lib/libkdu_a79R.dylib"

THIRDPARTYLIBS    += "$(ISIS3PROP)/lib/libkdu_v79R.dylib"





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

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

THIRDPARTYLIBS    += "$(ISIS3LOCAL)/lib/libcholmod*.dylib"
@@ -523,5 +573,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/"