Commit 718e070e authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by Jesse Mapel
Browse files

Removed redundant find scripts (#3394) 

* removed redundant scripts

* removed unused check from cmake lists

* removed debug prints

* removed v007 comment and boost debug flag
parent 3f7a9a0d

isis/CMakeLists.txt

+30 −9
Original line number Diff line number Diff line
@@ -224,11 +224,36 @@ find_package(Qt5 COMPONENTS 
                # Search this path explicitly for MacOS OpenGL Framework

                PATHS /System/Library/Frameworks/ 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)

find_package(Boost 1.59.0 REQUIRED atomic

                                        log

                                        regex

                                        log_setup

                                        serialization

                                        chrono

                                        math_c99

                                        signals

                                        container

                                        math_c99f

                                        context

                                        math_c99l

                                        system

                                        math_tr1

                                        math_tr1f

                                        math_tr1l

                                        test_exec_monitor

                                        date_time

                                        thread

                                        exception

                                        timer

                                        filesystem

                                        prg_exec_monitor

                                        program_options

                                        unit_test_framework

                                        iostreams

                                        wave

                                        random

                                        wserialization)



find_package(Bullet    2.86    REQUIRED)

find_package(Cholmod   4.4.5   REQUIRED)

find_package(CSPICE    65      REQUIRED)
@@ -276,7 +301,6 @@ set(ALLINCDIRS "") 


# Get all include dir variables

foreach (_variableName ${_variableNames})

#message("VAR=${_variableName}")

   if (_variableName MATCHES ".+_INCLUDE_DIR$")

     list(APPEND ALLINCDIRS "${${_variableName}}")

   elseif (_variableName MATCHES ".+_INCLUDE_PATH$")
@@ -288,9 +312,6 @@ endforeach() 
foreach (_variableName ${_variableNames})

   get_filename_component(LIBDIR "${${_variableName}}" DIRECTORY)

   if (_variableName MATCHES "^CMAKE+")

   elseif (_variableName MATCHES ".+_LIB$")

     list(APPEND ALLLIBDIRS "${LIBDIR}")

     list(APPEND ALLLIBS "${${_variableName}}")

   elseif (_variableName MATCHES ".+_LIBRARY$")

     list(APPEND ALLLIBDIRS "${LIBDIR}")

     list(APPEND ALLLIBS "${${_variableName}}")

isis/cmake/FindBoost.cmake

deleted100644 → 0
+0 −138
Original line number Diff line number Diff line 
# CMake module for find_package(Boost)

# Finds include directory and all applicable libraries

#

# Sets the following:

#   BOOST_INCLUDE_DIR



find_path(BOOST_INCLUDE_DIR

  NAME flyweight.hpp

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

)



get_filename_component(BOOST_ROOT_INCLUDE_DIR "${BOOST_INCLUDE_DIR}" DIRECTORY)



find_library(BOOST_ATOMIC_MT_LIBRARY

  NAMES boost_atomic-mt boost_atomic

)



find_library(BOOST_LOG_MT_LIBRARY

  NAMES boost_log-mt boost_log

)



find_library(BOOST_REGEX_MT_LIBRARY

  NAMES boost_regex-mt boost_regex

)



find_library(BOOST_LOG_SETUP_MT_LIBRARY

  NAMES boost_log_setup-mt boost_log_setup

)



find_library(BOOST_SERIALIZATION_MT_LIBRARY

  NAMES boost_serialization-mt boost_serialization

)



find_library(BOOST_CHRONO_MT_LIBRARY

  NAMES boost_chrono-mt boost_chrono

)



find_library(BOOST_MATH_C99_MT_LIBRARY

  NAMES boost_math_c99-mt boost_math_c99

)



find_library(BOOST_SIGNALS_MT_LIBRARY

  NAMES boost_signals-mt boost_signals

)



find_library(BOOST_CONTAINER_MT_LIBRARY

  NAMES boost_container-mt boost_container

)



find_library(BOOST_MATH_C99F_MT_LIBRARY

  NAMES boost_math_c99f-mt boost_math_c99f

)



find_library(BOOST_CONTEXT_MT_LIBRARY

  NAMES boost_context-mt boost_context

)



find_library(BOOST_MATH_C99L_MT_LIBRARY

  NAMES boost_math_c99l-mt boost_math_c99l

)



find_library(BOOST_SYSTEM_MT_LIBRARY

  NAMES boost_system-mt boost_system

)



find_library(BOOST_COROUTINE_MT_LIBRARY

  NAMES boost_coroutine-mt boost_coroutine

)



find_library(BOOST_MATH_TR1_MT_LIBRARY

  NAMES boost_math_tr1-mt boost_math_tr1

)



find_library(BOOST_MATH_TR1F_MT_LIBRARY

  NAMES boost_math_tr1f-mt boost_math_tr1f

)



find_library(BOOST_MATH_TR1L_MT_LIBRARY

  NAMES boost_math_tr1l-mt boost_math_tr1l

)



find_library(BOOST_TEST_EXEC_MONITOR_MT_LIBRARY

  NAMES boost_test_exec_monitor-mt boost_test_exec_monitor

)



find_library(BOOST_DATE_TIME_MT_LIBRARY

  NAMES boost_date_time-mt boost_date_time

)



find_library(BOOST_THREAD_MT_LIBRARY

  NAMES boost_thread-mt boost_thread

)



find_library(BOOST_EXCEPTION_MT_LIBRARY

  NAMES boost_exception-mt boost_exception

)



find_library(BOOST_TIMER_MT_LIBRARY

  NAMES boost_timer-mt boost_timer

)



find_library(BOOST_FILESYSTEM_MT_LIBRARY

  NAMES boost_filesystem-mt boost_filesystem

)



find_library(BOOST_PRG_EXEC_MONITOR_MT_LIBRARY

  NAMES boost_prg_exec_monitor-mt boost_prg_exec_monitor

)



find_library(BOOST_PROGRAM_OPTIONS_MT_LIBRARY

  NAMES boost_program_options-mt boost_program_options

)



find_library(BOOST_UNIT_TEST_FRAMEWORK_MT_LIBRARY

  NAMES boost_unit_test_framework-mt boost_unit_test_framework

)



find_library(BOOST_IOSTREAMS_MT_LIBRARY

  NAMES boost_iostreams-mt boost_iostreams

)



#message("BOOST_IOSTREAMS_MT_LIBRARY = ${BOOST_IOSTREAMS_MT_LIBRARY}")

#tjw:  Not sure if needed...commenting out because library is missing

#find_library(BOOST_PYTHON_MT_LIBRARY

#  NAMES boost_python-mt boost_python

#)



find_library(BOOST_WAVE_MT_LIBRARY

  NAMES boost_wave-mt boost_wave

)



find_library(BOOST_RANDOM_MT_LIBRARY

  NAMES boost_random-mt boost_random

)



find_library(BOOST_WSERIALIZATION_MT_LIBRARY

  NAMES boost_wserialization-mt boost_wserialization

)

isis/cmake/FindBullet.cmake

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
# CMake module for find_package(Bullet)

# Finds include directory and all applicable libraries

#

# Sets the following:

#   BULLET_INCLUDE_DIR

#   BULLET_LIBRARY



find_path(BULLET_INCLUDE_DIR

  NAME btBulletCollisionCommon.h

  PATH_SUFFIXES bullet

)



find_library(BULLET_OPENCL_LIBRARY NAMES Bullet3OpenCL_clew)

find_library(BULLET_SOFTBODY_LIBRARY NAMES BulletSoftBody)

find_library(BULLET_INVERSEDYNAMICS_LIBRARY NAMES BulletInverseDynamics)

find_library(BULLET_COMMON_LIBRARY NAMES Bullet3Common)

find_library(BULLET_DYNAMICS_LIBRARY NAMES BulletDynamics)

find_library(BULLET3_COLLISION_LIBRARY NAMES BulletCollision)

find_library(BULLET3_3GEOMETRY_LIBRARY NAMES Bullet3Geometry)

find_library(BULLET3_3DYNAMICS_LIBRARY NAMES Bullet3Dynamics)

find_library(BULLET3_3COLLISION_LIBRARY NAMES Bullet3Collision)

find_library(BULLET3_LINEARMATH_LIBRARY NAMES LinearMath)



get_filename_component(BULLET_ROOT_INCLUDE_DIR "${BULLET_INCLUDE_DIR}" DIRECTORY)



message(STATUS "BULLET INCLUDE: " ${BULLET_INCLUDE_DIR} )

message(STATUS "BULLET OPENCL: " ${BULLET_OPENCL_LIBRARY} )

message(STATUS "BULLET SOFTBODY: " ${BULLET_SOFTBODY_LIBRARY})

message(STATUS "BULLET INVERSE DYNAMICS: " ${BULLET_INVERSEDYNAMICS_LIBRARY} )

message(STATUS "BULLET DYNAMICS: " ${BULLET3_DYNAMICS_LIBRARY} )

message(STATUS "BULLET COLLISION: " ${BULLET3_COLLISION_LIBRARY} )

message(STATUS "BULLET GEOMETRY: " ${BULLET3_GEOMETRY_LIBRARY} )

message(STATUS "BULLET3 3DYNAMICS: " ${BULLET3_3DYNAMICS_LIBRARY} )

message(STATUS "BULLET3 3COLLISION: " ${BULLET3_3COLLISION_LIBRARY} )

message(STATUS "BULLET3 LINEARMATH: "  ${BULLET3_LINEARMATH_LIBRARY} )

isis/cmake/FindGSL.cmake

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
# CMake module for find_package(GSL)

# Finds include directory and all applicable libraries

#

# Sets the following:

#   GSL_INCLUDE_DIR

#   GSL_LIBLIST



find_path(GSL_INCLUDE_DIR

  NAMES gsl_math.h

  PATH_SUFFIXES gsl

)



find_library(GSL_LIBRARY

  NAMES gsl

)



find_library(GSL_CBLAS_LIBRARY

  NAMES gslcblas

)



get_filename_component(GSL_ROOT_INCLUDE_DIR "${GSL_INCLUDE_DIR}" DIRECTORY)



message(STATUS "GSL INCLUDE DIR: ${GSL_INCLUDE_DIR}")

message(STATUS "GSL LIB: ${GSL_LIBRARY}")

message(STATUS "GSL CBLAS LIB: ${GSL_CBLAS_LIBRARY}")

isis/cmake/FindHDF5.cmake

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
# CMake module for find_package(HDF5)

# Finds include directory and all applicable libraries

#

# Sets the following:

#   HDF5_INCLUDE_DIR

#   HDF5_LIBRARY



find_path(HDF5_INCLUDE_DIR

  NAME hdf5.h

  PATH_SUFFIXES hdf5

)



find_library(HDF5_LIBRARY         NAMES hdf5)

find_library(HDF5_CPP_LIBRARY     NAMES hdf5_cpp)

find_library(HDF5_HL_LIBRARY      NAMES hdf5_hl)

find_library(HDF5_HLCPP_LIBRARY   NAMES hdf5_hl_cpp)



get_filename_component(HDF5_ROOT_INCLUDE_DIR "${HDF5_INCLUDE_DIR}" DIRECTORY)



message(STATUS "HDF5 INCLUDE DIR: ${HDF5_INCLUDE_DIR}")

message(STATUS "HDF5 LIB: ${HDF5_LIBRARY}")

message(STATUS "HDF5 CPP LIB: ${HDF5_CPP_LIBRARY}")

message(STATUS "HDF5 HL LIB: ${HDF5_HL_LIBRARY}")

message(STATUS "HDF5 HLCPP LIB: ${HDF5_HLCPP_LIBRARY}")