Commit 9597767a authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

merging from upstream

parents 355ac2aa fc8baa5a

isis/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ set(CMAKE_PREFIX_PATH 
  /opt/usgs/v007/proprietary/

  /opt/usgs/v007/proprietary/include/

  /opt/usgs/v007/proprietary/lib/

  /usr/lib

  /usr/lib/

  /usr/lib64/

  /usr/local/lib

  /usr/local/lib/

)



set(CMAKE_FIND_FRAMEWORK LAST)

isis/cmake/AddIsisModule.cmake

+0 −1
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ function(add_isis_obj folder reqLibs) 
    set(pluginPath ${CMAKE_BINARY_DIR}/lib/${pluginName})

    cat(${plugins} ${pluginPath})

    install(PROGRAMS ${pluginPath} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/)



    # Record this library name for the caller

    set(newPluginLib ${libName}  PARENT_SCOPE)

  endif()

isis/cmake/FindAllDependencies.cmake

+36 −22
Original line number Diff line number Diff line
@@ -121,28 +121,42 @@ else() #oh god why 
  find_library(QT5_XMLPATTERNS_LIBRARY           NAMES Qt5XmlPatterns)

endif(APPLE)



find_package(Qwt 6 REQUIRED)

find_package(XercesC 3.1 REQUIRED)

find_package(GeoTIFF 2 REQUIRED)

find_package(TIFF 5 REQUIRED)



# Some of these will have non-traditional installs with version numbers in the paths in v007

# For these, we pass in a version number, and use it in the path suffix

# This only applies to v007, and outside of the building, we should only expect standard installs

# The v007-specific installs are listed beside their find_package calls below:

find_package(Boost     1.59.0  REQUIRED) # "boost/boost${Boost_FIND_VERSION}/boost/"

find_package(Bullet    2.86    REQUIRED)

find_package(Cholmod   4.4.5   REQUIRED) # "SuiteSparse/SuiteSparse${Cholmod_FIND_VERSION}/SuiteSparse/"

find_package(CSPICE    65      REQUIRED)

find_package(TNT 1.2.6 REQUIRED)

find_package(GSL 19 REQUIRED)

find_package(Protobuf 9 REQUIRED)

find_package(Boost 1.59 REQUIRED)

find_package(X11 6 REQUIRED)

find_package(Eigen             REQUIRED)

find_package(Embree    2.15.0  REQUIRED)

find_package(GeoTIFF   2       REQUIRED)

find_package(GMM       5.0     REQUIRED) # "/gmm/gmm-${GMM_FIND_VERSION}/gmm/"

find_package(GSL       19      REQUIRED)

find_package(GMM REQUIRED)

find_package(HDF5      1.8.15  REQUIRED)

find_package(SuperLU 4.3 REQUIRED)

find_package(Cholmod 4.4.5 REQUIRED)

find_package(Embree 2.15.0 REQUIRED)

find_package(PCL 1.8.0 REQUIRED)

find_package(Eigen REQUIRED)

find_package(Bullet 2.86 REQUIRED)

find_package(OpenCV 3.1.0 REQUIRED)

find_package(Jama      125     REQUIRED) # Jama version is 1.2.5, but v007 directory is "jama/jama125/"

find_package(NN                REQUIRED)

find_package(Jama REQUIRED)

find_package(OpenCV    3.1.0   REQUIRED)

find_package(PCL       1.8     REQUIRED) # "pcl-${PCL_FIND_VERSION}"

find_package(Protobuf  2.6.1   REQUIRED) # "google-protobuf/protobuf${Protobuf_FIND_VERSION}/"

find_package(Qwt       6       REQUIRED) # "qwt${Qwt_FIND_VERSION}"

find_package(SuperLU   4.3     REQUIRED) # "superlu/superlu${SuperLU_FIND_VERSION}/superlu/"

find_package(TIFF      4.0.5   REQUIRED) # "tiff/tiff-${TIFF_FIND_VERSION}"

find_package(TNT       126     REQUIRED) # TNT version is 1.2.6, but v007 directory is "tnt/tnt126/"

find_package(XercesC   3.1.2   REQUIRED) # "xercesc/xercesc-${XercesC_FIND_VERSION}/"

find_package(X11       6       REQUIRED)



# v007 might have different versions installed for our mac and linux systems.

# Im this case, we specify the version numbers being searched for in the non-traditional installs.

if(APPLE)

  find_package(Geos    3.5.0   REQUIRED)

else(APPLE)

  find_package(Geos    3.5.1   REQUIRED)

endif(APPLE)









# Only include Kakadu if it is available

isis/cmake/FindBoost.cmake

+1 −3
Original line number Diff line number Diff line
@@ -6,11 +6,9 @@ 


find_path(BOOST_INCLUDE_DIR

  NAME flyweight.hpp

  PATH_SUFFIXES boost/boost1.59.0/boost/ boost

  PATH_SUFFIXES "boost/boost${Boost_FIND_VERSION}/boost/" "boost"

)



message("BOOST_INCLUDE_DIR = ${BOOST_INCLUDE_DIR}")



get_filename_component(BOOST_ROOT_INCLUDE_DIR "${BOOST_INCLUDE_DIR}" DIRECTORY)



find_library(BOOST_ATOMIC_MT_LIBRARY

isis/cmake/FindCholmod.cmake

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


find_path(CHOLMOD_INCLUDE_DIR

  NAME cholmod.h

  PATH_SUFFIXES SuiteSparse/SuiteSparse4.4.5/SuiteSparse/ SuiteSparse

  PATH_SUFFIXES "SuiteSparse/SuiteSparse${Cholmod_FIND_VERSION}/SuiteSparse/" "SuiteSparse"

)



find_library(CHOLMOD_LIBRARY      NAMES cholmod)