Commit 6dcf93f8 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

removed version code from find scripts

parent 0e2c71a9

isis/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ list(APPEND CMAKE_INCLUDE_PATH 
  /usgs/pkgs/local/v007/include/xercesc/xercesc-3.1.2/

  /usgs/pkgs/local/v007/include/tiff/tiff-4.0.5/

  /usr/lib64/



)



set(CMAKE_PREFIX_PATH

isis/cmake/FindBoost.cmake

+0 −17
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ find_path(BOOST_INCLUDE_DIR 


message("BOOST_INCLUDE_DIR = ${BOOST_INCLUDE_DIR}")





get_filename_component(BOOST_ROOT_INCLUDE_DIR "${BOOST_INCLUDE_DIR}" DIRECTORY)



find_library(BOOST_ATOMIC_MT_LIBRARY
@@ -120,19 +119,3 @@ find_library(PYTHON_LIBRARY 
find_library(C_LIBRARY

  NAMES c

)
 


#tjw

#if(APPLE)

#  file(READ "${BOOST_INCLUDE_DIR}/version.hpp" EXTRACT LIMIT 4 OFFSET 1103)

#  string(SUBSTRING ${EXTRACT} 0 1 VERSION_MAJOR)

#  string(SUBSTRING ${EXTRACT} 2 2 VERSION_MINOR)

#  string(CONCAT VERSION_NUM ${VERSION_MAJOR} "." ${VERSION_MINOR})

#else(APPLE)

#  get_version(${BOOST_ATOMIC_MT_LIBRARY} VERSION_NUM)

#endif(APPLE)



#message("BOOST FOUND VERSION = ${VERSION_NUM}")



#if(VERSION_NUM VERSION_LESS Boost_FIND_VERSION)

#  message(FATAL_ERROR "Boost version is too old (${VERSION_NUM}). Use ${Boost_FIND_VERSION} or higher.")

#endif(VERSION_NUM VERSION_LESS Boost_FIND_VERSION)

isis/cmake/FindCSPICE.cmake

+0 −8
Original line number Diff line number Diff line
@@ -13,11 +13,3 @@ find_path(CSPICE_INCLUDE_DIR 
find_library(CSPICE_LIBRARY

  NAMES cspice

)
 


string(REGEX MATCH "^(/([a-z or A-Z or 0-9])*)*" MY_PATH ${CSPICE_LIBRARY}})

file(GLOB FOUND_FILES

      "${MY_PATH}.*[0-9]**.a"

)

get_filename_component(VERSION_FILE "${FOUND_FILES}" NAME)



get_filename_component(CSPICE_ROOT_INCLUDE_DIR "${CSPICE_INCLUDE_DIR}" DIRECTORY)

isis/cmake/FindEigen.cmake

+0 −2
Original line number Diff line number Diff line
@@ -13,5 +13,3 @@ find_path(EIGEN_ROOT_INCLUDE_DIR 
  NAME Eigen

  PATH_SUFFIXES eigen eigen3

)
 


message("Eigen FOUND")

isis/cmake/FindGMM.cmake

+0 −2
Original line number Diff line number Diff line
@@ -10,5 +10,3 @@ find_path(GMM_INCLUDE_DIR 
)



get_filename_component(GMM_ROOT_INCLUDE_DIR "${GMM_INCLUDE_DIR}" DIRECTORY)
 


message("GMM FOUND VERSION = UNABLE TO VERSION")