Commit cee9e3c0 authored by Summer Stapleton's avatar Summer Stapleton
Browse files

PROG: Updated config and source to fix c++14 warnings and compile issues. References #4809. 

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

isis/make/config.linux-x86_64_Fedora25

+43 −37
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ ISISCPPFLAGS += -std=c++14 
ISISCPPFLAGS += -DISIS_LITTLE_ENDIAN=1

ISISCPPFLAGS += -fPIC

ISISCPPFLAGS += -DGMM_USES_SUPERLU

#ISISCPPFLAGS += -Wno-misleading-indentation



ifeq ($(findstring DEBUG, $(MODE)),DEBUG)

  ISISCPPFLAGS += -g
@@ -160,7 +161,7 @@ NAIFLIB = -lcspice 
#---------------------------------------------------------------------------

# Set up for TNT

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

TNTINCDIR = -I$(ISIS3LOCAL)/include/tnt/tnt126 -I$(ISIS3LOCAL)/include/tnt/tnt126/tnt

TNTINCDIR = -isystem $(ISIS3LOCAL)/include/tnt/tnt126 -isystem $(ISIS3LOCAL)/include/tnt/tnt126/tnt

TNTLIBDIR =

TNTLIB    =
@@ -174,7 +175,7 @@ JAMALIB = 
#---------------------------------------------------------------------------

# Set up for GEOS

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

GEOSINCDIR = -I$(ISIS3LOCAL)/include/geos/geos3.5.0

GEOSINCDIR = -isystem $(ISIS3LOCAL)/include/geos/geos3.5.0

GEOSLIBDIR = -L$(ISIS3LOCAL)/lib

GEOSLIB    = -lgeos-3.5.0 -lgeos_c
@@ -201,7 +202,7 @@ X11LIB = -lX11 
#---------------------------------------------------------------------------

# Set up for GMM

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

GMMINCDIR = -I$(ISIS3LOCAL)/include/gmm/gmm-5.0 -I$(ISIS3LOCAL)/include/gmm/gmm-5.0/gmm

GMMINCDIR = -isystem $(ISIS3LOCAL)/include/gmm/gmm-5.0 -isystem $(ISIS3LOCAL)/include/gmm/gmm-5.0/gmm

GMMLIBDIR =

GMMLIB    =
@@ -247,7 +248,7 @@ ISISCPPFLAGS += -DENABLEJP2K=$(JP2KFLAG) 
#---------------------------------------------------------------------------

# Set up for BOOST

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

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

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

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 \
@@ -273,9 +274,9 @@ 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

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)
@@ -285,14 +286,14 @@ EIGENINCDIR = -I$(ISIS3LOCAL)/include/eigen 
#---------------------------------------------------------------------------

# Set up for VTK

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

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

#VTKLIBDIR = -L$(ISIS3LOCAL)/lib

#VTKLIB    = -lvtksys-7.1

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

VTKLIBDIR = -L$(ISIS3LOCAL)/lib

VTKLIB    = -lvtksys-7.1



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

# Set up for FLANN

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

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

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



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

# Set up for QHull
@@ -302,9 +303,9 @@ EIGENINCDIR = -I$(ISIS3LOCAL)/include/eigen 
#---------------------------------------------------------------------------

# Set up for Embree libraries 

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

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

#EMBREELIBDIR = -L$(ISIS3LOCAL)/lib

#EMBREELIB    = -lembree

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

EMBREELIBDIR = -L$(ISIS3LOCAL)/lib

EMBREELIB    = -lembree



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

# Set up for OpenCV libraries
@@ -341,16 +342,21 @@ NNLIB = -lnn 
#---------------------------------------------------------------------------

# Setup for Bullet Physics library

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

#BULLETLIB     = -lBullet3Collision  -lBullet3Common          \

#                -lBullet3Dynamics   -lBullet3Geometry  -lBullet3OpenCL_clew     \

#                -lBulletCollision   -lBulletDynamics   -lBulletInverseDynamics  \

#                -lBulletSoftBody    -lLinearMath 

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

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

BULLETLIBDIR  = -L$(ISIS3LOCAL)/lib



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

# TBB

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

TBBLIBS = -l:libtbb.so.2



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

# Final generic setup for includes at the top level
@@ -501,28 +507,28 @@ 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*"

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/libpcl*.so*"

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

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

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

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



# Add the Embree library

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

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

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

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



# Add the Boost libraries

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

isis/src/base/apps/grid/grid.cpp

+2 −1
Original line number Diff line number Diff line
@@ -162,9 +162,10 @@ void IsisMain() { 


    latLonGrid->CreateGrid(baseLat, baseLon, latInc, lonInc, &progress);



    if (ui.GetBoolean("BOUNDARY"))

    if (ui.GetBoolean("BOUNDARY")) {

      latLonGrid->WalkBoundary();

      walkBoundary = true;

    }



    p.StartProcess(groundGrid);

    p.EndProcess();

isis/src/base/apps/phohillier/phohillier.cpp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ void IsisMain() { 
  UserInterface &ui = Application::GetUserInterface();

  // Get the name of the parameter file

  Pvl par(ui.GetFileName("PHOPAR"));

  auto_ptr<Hillier> photom = auto_ptr<Hillier> (new Hillier(par,  *icube));

  unique_ptr<Hillier> photom = unique_ptr<Hillier> (new Hillier(par,  *icube));

  pho = photom.get();



  // Start the processing

isis/src/base/objs/PolygonTools/PolygonTools.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1024,7 +1024,7 @@ namespace Isis { 
    unsigned int minPrecision = 13;

    while(failed) {

      try {

        std::auto_ptr< geos::geom::Geometry > resultAuto =

        std::unique_ptr< geos::geom::Geometry > resultAuto =

          BinaryOp(geomFirst, geomSecond, geos::operation::overlay::overlayOp(code));

        failed = false;

        result = resultAuto->clone();

isis/src/base/objs/PolygonTools/PolygonTools.h

+3 −0
Original line number Diff line number Diff line
@@ -125,6 +125,9 @@ namespace Isis { 
   *   @history 2013-08-12 Stuart Sides - Added SplitPolygonOn360 and

   *                           FixPolePolygon methods.  Code was extracted from the ImagePolygon

   *                           class.  References #1604.

   *   @history 2017-08-18 Tyler Wilson, Summer Stapleton, Ian Humphrey - Changed auto_ptr references

   *                           to unique_ptr so that this class compiles with no warnings for 

   *                           C++14.  References #4809.

   */



  class PolygonTools {