Loading isis/CMakeLists.txt +26 −45 Original line number Diff line number Diff line Loading @@ -10,41 +10,7 @@ cmake_minimum_required(VERSION 3.4) # Point cmake to our other CMake files. list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") list(APPEND CMAKE_INCLUDE_PATH /usgs/pkgs/local/v007/include/ /usgs/pkgs/local/v007/bin/ /usgs/pkgs/local/v007/lib/ /usgs/pkgs/local/v007/objects/ /usgs/pkgs/local/v007/include/google-protobuf/protobuf2.6.1/ /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 /usgs/pkgs/local/v007/include/ /usgs/pkgs/local/v007/bin/ /usgs/pkgs/local/v007/lib/ /usgs/pkgs/local/v007/libexec/ /opt/usgs/v007/ports/Library/Frameworks/ /opt/usgs/v007/ports/libexec/ /opt/usgs/v007/ports/bin/ /opt/usgs/v007/ports/lib/ /opt/usgs/v007/ports/include/ /opt/usgs/v007/ports/libexec/qt5 /opt/usgs/v007/ports/libexec/qt5/bin/ /opt/usgs/v007/ports/libexec/qt5/lib/ /opt/usgs/v007/3rdparty/bin /opt/usgs/v007/3rdparty/include/ /opt/usgs/v007/3rdparty/lib/ /opt/usgs/v007/proprietary/ /opt/usgs/v007/proprietary/include/ /opt/usgs/v007/proprietary/lib/ /usr/lib/ /usr/lib64/ /usr/local/lib/ ) # always look for framworks last set(CMAKE_FIND_FRAMEWORK LAST) include(AddIsisModule) Loading @@ -58,7 +24,6 @@ include(InstallThirdParty) project (USGS_ISIS) # Short and long name of this package set(PACKAGE "ISIS") set(PACKAGE_NAME "USGS ISIS") Loading Loading @@ -95,17 +60,31 @@ set(BUILD_SHARED_LIBS ON) # Specify flags used set(thirdPartyCppFlags -Wall -std=c++11 -DISIS_LITTLE_ENDIAN=1 -fPIC -Wno-unused-parameter -Wno-overloaded-virtual) #set(thirdPartyCppFlags -Wall -ansi -DISIS_LITTLE_ENDIAN=1 -fPIC -Wno-unused-parameter -Wno-overloaded-virtual) # Specify user options that can be passed in with the initial CMake command. option(isis3Data "Directory containing Isis3Data" "NA") option(isis3TestData "Directory containing Isis3TestData" "NA") option(testOutputDir "Directory to store app test output folders" "NA") option(isis3Data "Directory containing Isis3Data" OFF ) option(isis3TestData "Directory containing Isis3TestData" OFF ) option(testOutputDir "Directory to store app test output folders" OFF ) option(buildCore "Build the core ISIS modules" ON ) option(buildMissions "Build the mission specific modules" ON ) option(buildStaticCore "Build libisis3 static as well as dynamic" OFF ) option(buildTests "Set up unit, application, and module tests." ON ) option(JP2KFLAG "Whether or not to build using JPEG200 support" OFF ) option(JP2KFLAG "Whether or not to build using JPEG2000 support" ON ) option(develop "Use a devleopment configuration" ON ) # options only allow on/off but this flag is piped into ISIS as ENABLEJP2K # needs to be either 1 or 0 for C style true false if(JP2KFLAG) set(JP2KFLAG 1) endif() # Prioritize passed in variables over env vars, probably a better way to do this if(DEFINED ENV{ISIS3DATA} AND NOT isis3Data) set(isis3Data $ENV{ISIS3DATA}) endif() if(DEFINED ENV{ISIS3TESTDATA} AND NOT isis3TestData) set(isis3TestData $ENV{ISIS3TESTDATA}) endif() if(EXISTS ${isis3Data}) set(ENV{ISIS3DATA} "${isis3Data}") Loading @@ -113,12 +92,14 @@ if(EXISTS ${isis3Data}) else() message(WARNING "Isis3Data directory ${isis3Data} not found, unit tests will fail.") endif() if(EXISTS ${isis3TestData}) set(ENV{ISIS3TESTDATA} "${isis3TestData}") message("Using ISIS3TESTDATA = $ENV{ISIS3TESTDATA}") else() message(WARNING "Isis3TestData directory ${isis3TestData} not found, application and module tests will fail.") endif() #if(EXISTS ${CMAKE_INSTALL_PREFIX}) # set(ENV{CMAKE_INSTALL_PREFIX} "${CMAKE_INSTALL_PREFIX}") # message("Using INSTALL PREFIX = $ENV{CMAKE_INSTALL_PREFIX}") Loading isis/cmake/FindAllDependencies.cmake +38 −10 Original line number Diff line number Diff line Loading @@ -4,6 +4,41 @@ # go looking for them if they are not? #=============================================================================== list(APPEND CMAKE_INCLUDE_PATH /usgs/pkgs/local/v007/include/ /usgs/pkgs/local/v007/bin/ /usgs/pkgs/local/v007/lib/ /usgs/pkgs/local/v007/objects/ /usgs/pkgs/local/v007/include/google-protobuf/protobuf2.6.1/ /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 /usgs/pkgs/local/v007/include/ /usgs/pkgs/local/v007/bin/ /usgs/pkgs/local/v007/lib/ /usgs/pkgs/local/v007/libexec/ /opt/usgs/v007/ports/Library/Frameworks/ /opt/usgs/v007/ports/libexec/ /opt/usgs/v007/ports/bin/ /opt/usgs/v007/ports/lib/ /opt/usgs/v007/ports/include/ /opt/usgs/v007/ports/libexec/qt5 /opt/usgs/v007/ports/libexec/qt5/bin/ /opt/usgs/v007/ports/libexec/qt5/lib/ /opt/usgs/v007/3rdparty/bin /opt/usgs/v007/3rdparty/include/ /opt/usgs/v007/3rdparty/lib/ /opt/usgs/v007/proprietary/ /opt/usgs/v007/proprietary/include/ /opt/usgs/v007/proprietary/lib/ /usr/lib/ /usr/lib64/ /usr/local/lib/ ) # Specify top level directories set(thirdPartyDir "/usgs/pkgs/local/v007") set(INCLUDE_DIR "${thirdPartyDir}/include") Loading Loading @@ -147,6 +182,8 @@ 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) find_package(OpenGL REQUIRED) find_package(Kakadu) # 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. Loading @@ -156,15 +193,6 @@ else(APPLE) find_package(Geos 3.5.1 REQUIRED) endif(APPLE) # Only include Kakadu if it is available if(${JP2KFLAG}) message("ENABLING KAKADU") find_package(Kakadu) endif(${JP2KFLAG}) get_cmake_property(_variableNames VARIABLES) # Get All VARIABLES foreach (_variableName ${_variableNames}) #message("VAR=${_variableName}") Loading isis/cmake/FindBoost.cmake +31 −0 Original line number Diff line number Diff line Loading @@ -14,81 +14,107 @@ 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 ) Loading @@ -98,9 +124,11 @@ find_library(BOOST_IOSTREAMS_MT_LIBRARY #find_library(BOOST_PYTHON_MT_LIBRARY # NAMES boost_python-mt boost_python #) find_library(BOOST_WAVE_MT_LIBRARY NAMES boost_wave-mt boost_wave ) #tjw: not being linked against by ISIS presently #find_library(BOOST_LOCAL_MT_LIBRARY # NAMES boost_locale-mt boost_locale Loading @@ -108,12 +136,15 @@ find_library(BOOST_WAVE_MT_LIBRARY find_library(BOOST_RANDOM_MT_LIBRARY NAMES boost_random-mt boost_random ) find_library(BOOST_WSERIALIZATION_MT_LIBRARY NAMES boost_wserialization-mt boost_wserialization ) find_library(PYTHON_LIBRARY NAMES python2 python2.7 python3 ) find_library(C_LIBRARY NAMES c ) isis/cmake/FindBullet.cmake +11 −11 Original line number Diff line number Diff line Loading @@ -23,14 +23,14 @@ find_library(BULLET3_LINEARMATH_LIBRARY NAMES LinearMath) get_filename_component(BULLET_ROOT_INCLUDE_DIR "${BULLET_INCLUDE_DIR}" DIRECTORY) message( "BULLET INCLUDE: " ${BULLET_INCLUDE_DIR} ) message( "BULLET OPENCL: " ${BULLET_OPENCL_LIBRARY} ) message( "BULLET SOFTBODY: " ${BULLET_SOFTBODY_LIBRARY}) message( "BULLET INVERSE DYNAMICS: " ${BULLET_INVERSEDYNAMICS_LIBRARY} ) message( "BULLET DYNAMICS: " ${BULLET_DYNAMICS_LIBRARY} ) message( "BULLET COLLISION: " ${BULLET_COLLISION_LIBRARY} ) message( "BULLET GEOMETRY: " ${BULLET3_GEOMETRY_LIBRARY} ) message( "BULLET3 DYNAMICS: " ${BULLET3_DYNAMICS_LIBRARY} ) message( "BULLET3 COLLISION: " ${BULLET3_COLLISION_LIBRARY} ) message( "BULLET3 COMMON: " ${BULLET3_COMMON_LIBRARY} ) message( "BULLET3 LINEARMATH: " ${BULLET3_LINEARMATH_LIBRARY} ) message( "-- BULLET INCLUDE: " ${BULLET_INCLUDE_DIR} ) message( "-- BULLET OPENCL: " ${BULLET_OPENCL_LIBRARY} ) message( "-- BULLET SOFTBODY: " ${BULLET_SOFTBODY_LIBRARY}) message( "-- BULLET INVERSE DYNAMICS: " ${BULLET_INVERSEDYNAMICS_LIBRARY} ) message( "-- BULLET DYNAMICS: " ${BULLET_DYNAMICS_LIBRARY} ) message( "-- BULLET COLLISION: " ${BULLET_COLLISION_LIBRARY} ) message( "-- BULLET GEOMETRY: " ${BULLET3_GEOMETRY_LIBRARY} ) message( "-- BULLET3 DYNAMICS: " ${BULLET3_DYNAMICS_LIBRARY} ) message( "-- BULLET3 COLLISION: " ${BULLET3_COLLISION_LIBRARY} ) message( "-- BULLET3 COMMON: " ${BULLET3_COMMON_LIBRARY} ) message( "-- BULLET3 LINEARMATH: " ${BULLET3_LINEARMATH_LIBRARY} ) isis/cmake/FindCSPICE.cmake +2 −2 Original line number Diff line number Diff line Loading @@ -14,5 +14,5 @@ find_library(CSPICE_LIBRARY NAMES cspice ) message( "CSPICE INCLUDE: " ${CSPICE_INCLUDE_DIR} ) message( "CSPICE LIB: " ${CSPICE_LIBRARY} ) message( "-- CSPICE INCLUDE: " ${CSPICE_INCLUDE_DIR} ) message( "-- CSPICE LIB: " ${CSPICE_LIBRARY} ) Loading
isis/CMakeLists.txt +26 −45 Original line number Diff line number Diff line Loading @@ -10,41 +10,7 @@ cmake_minimum_required(VERSION 3.4) # Point cmake to our other CMake files. list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") list(APPEND CMAKE_INCLUDE_PATH /usgs/pkgs/local/v007/include/ /usgs/pkgs/local/v007/bin/ /usgs/pkgs/local/v007/lib/ /usgs/pkgs/local/v007/objects/ /usgs/pkgs/local/v007/include/google-protobuf/protobuf2.6.1/ /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 /usgs/pkgs/local/v007/include/ /usgs/pkgs/local/v007/bin/ /usgs/pkgs/local/v007/lib/ /usgs/pkgs/local/v007/libexec/ /opt/usgs/v007/ports/Library/Frameworks/ /opt/usgs/v007/ports/libexec/ /opt/usgs/v007/ports/bin/ /opt/usgs/v007/ports/lib/ /opt/usgs/v007/ports/include/ /opt/usgs/v007/ports/libexec/qt5 /opt/usgs/v007/ports/libexec/qt5/bin/ /opt/usgs/v007/ports/libexec/qt5/lib/ /opt/usgs/v007/3rdparty/bin /opt/usgs/v007/3rdparty/include/ /opt/usgs/v007/3rdparty/lib/ /opt/usgs/v007/proprietary/ /opt/usgs/v007/proprietary/include/ /opt/usgs/v007/proprietary/lib/ /usr/lib/ /usr/lib64/ /usr/local/lib/ ) # always look for framworks last set(CMAKE_FIND_FRAMEWORK LAST) include(AddIsisModule) Loading @@ -58,7 +24,6 @@ include(InstallThirdParty) project (USGS_ISIS) # Short and long name of this package set(PACKAGE "ISIS") set(PACKAGE_NAME "USGS ISIS") Loading Loading @@ -95,17 +60,31 @@ set(BUILD_SHARED_LIBS ON) # Specify flags used set(thirdPartyCppFlags -Wall -std=c++11 -DISIS_LITTLE_ENDIAN=1 -fPIC -Wno-unused-parameter -Wno-overloaded-virtual) #set(thirdPartyCppFlags -Wall -ansi -DISIS_LITTLE_ENDIAN=1 -fPIC -Wno-unused-parameter -Wno-overloaded-virtual) # Specify user options that can be passed in with the initial CMake command. option(isis3Data "Directory containing Isis3Data" "NA") option(isis3TestData "Directory containing Isis3TestData" "NA") option(testOutputDir "Directory to store app test output folders" "NA") option(isis3Data "Directory containing Isis3Data" OFF ) option(isis3TestData "Directory containing Isis3TestData" OFF ) option(testOutputDir "Directory to store app test output folders" OFF ) option(buildCore "Build the core ISIS modules" ON ) option(buildMissions "Build the mission specific modules" ON ) option(buildStaticCore "Build libisis3 static as well as dynamic" OFF ) option(buildTests "Set up unit, application, and module tests." ON ) option(JP2KFLAG "Whether or not to build using JPEG200 support" OFF ) option(JP2KFLAG "Whether or not to build using JPEG2000 support" ON ) option(develop "Use a devleopment configuration" ON ) # options only allow on/off but this flag is piped into ISIS as ENABLEJP2K # needs to be either 1 or 0 for C style true false if(JP2KFLAG) set(JP2KFLAG 1) endif() # Prioritize passed in variables over env vars, probably a better way to do this if(DEFINED ENV{ISIS3DATA} AND NOT isis3Data) set(isis3Data $ENV{ISIS3DATA}) endif() if(DEFINED ENV{ISIS3TESTDATA} AND NOT isis3TestData) set(isis3TestData $ENV{ISIS3TESTDATA}) endif() if(EXISTS ${isis3Data}) set(ENV{ISIS3DATA} "${isis3Data}") Loading @@ -113,12 +92,14 @@ if(EXISTS ${isis3Data}) else() message(WARNING "Isis3Data directory ${isis3Data} not found, unit tests will fail.") endif() if(EXISTS ${isis3TestData}) set(ENV{ISIS3TESTDATA} "${isis3TestData}") message("Using ISIS3TESTDATA = $ENV{ISIS3TESTDATA}") else() message(WARNING "Isis3TestData directory ${isis3TestData} not found, application and module tests will fail.") endif() #if(EXISTS ${CMAKE_INSTALL_PREFIX}) # set(ENV{CMAKE_INSTALL_PREFIX} "${CMAKE_INSTALL_PREFIX}") # message("Using INSTALL PREFIX = $ENV{CMAKE_INSTALL_PREFIX}") Loading
isis/cmake/FindAllDependencies.cmake +38 −10 Original line number Diff line number Diff line Loading @@ -4,6 +4,41 @@ # go looking for them if they are not? #=============================================================================== list(APPEND CMAKE_INCLUDE_PATH /usgs/pkgs/local/v007/include/ /usgs/pkgs/local/v007/bin/ /usgs/pkgs/local/v007/lib/ /usgs/pkgs/local/v007/objects/ /usgs/pkgs/local/v007/include/google-protobuf/protobuf2.6.1/ /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 /usgs/pkgs/local/v007/include/ /usgs/pkgs/local/v007/bin/ /usgs/pkgs/local/v007/lib/ /usgs/pkgs/local/v007/libexec/ /opt/usgs/v007/ports/Library/Frameworks/ /opt/usgs/v007/ports/libexec/ /opt/usgs/v007/ports/bin/ /opt/usgs/v007/ports/lib/ /opt/usgs/v007/ports/include/ /opt/usgs/v007/ports/libexec/qt5 /opt/usgs/v007/ports/libexec/qt5/bin/ /opt/usgs/v007/ports/libexec/qt5/lib/ /opt/usgs/v007/3rdparty/bin /opt/usgs/v007/3rdparty/include/ /opt/usgs/v007/3rdparty/lib/ /opt/usgs/v007/proprietary/ /opt/usgs/v007/proprietary/include/ /opt/usgs/v007/proprietary/lib/ /usr/lib/ /usr/lib64/ /usr/local/lib/ ) # Specify top level directories set(thirdPartyDir "/usgs/pkgs/local/v007") set(INCLUDE_DIR "${thirdPartyDir}/include") Loading Loading @@ -147,6 +182,8 @@ 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) find_package(OpenGL REQUIRED) find_package(Kakadu) # 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. Loading @@ -156,15 +193,6 @@ else(APPLE) find_package(Geos 3.5.1 REQUIRED) endif(APPLE) # Only include Kakadu if it is available if(${JP2KFLAG}) message("ENABLING KAKADU") find_package(Kakadu) endif(${JP2KFLAG}) get_cmake_property(_variableNames VARIABLES) # Get All VARIABLES foreach (_variableName ${_variableNames}) #message("VAR=${_variableName}") Loading
isis/cmake/FindBoost.cmake +31 −0 Original line number Diff line number Diff line Loading @@ -14,81 +14,107 @@ 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 ) Loading @@ -98,9 +124,11 @@ find_library(BOOST_IOSTREAMS_MT_LIBRARY #find_library(BOOST_PYTHON_MT_LIBRARY # NAMES boost_python-mt boost_python #) find_library(BOOST_WAVE_MT_LIBRARY NAMES boost_wave-mt boost_wave ) #tjw: not being linked against by ISIS presently #find_library(BOOST_LOCAL_MT_LIBRARY # NAMES boost_locale-mt boost_locale Loading @@ -108,12 +136,15 @@ find_library(BOOST_WAVE_MT_LIBRARY find_library(BOOST_RANDOM_MT_LIBRARY NAMES boost_random-mt boost_random ) find_library(BOOST_WSERIALIZATION_MT_LIBRARY NAMES boost_wserialization-mt boost_wserialization ) find_library(PYTHON_LIBRARY NAMES python2 python2.7 python3 ) find_library(C_LIBRARY NAMES c )
isis/cmake/FindBullet.cmake +11 −11 Original line number Diff line number Diff line Loading @@ -23,14 +23,14 @@ find_library(BULLET3_LINEARMATH_LIBRARY NAMES LinearMath) get_filename_component(BULLET_ROOT_INCLUDE_DIR "${BULLET_INCLUDE_DIR}" DIRECTORY) message( "BULLET INCLUDE: " ${BULLET_INCLUDE_DIR} ) message( "BULLET OPENCL: " ${BULLET_OPENCL_LIBRARY} ) message( "BULLET SOFTBODY: " ${BULLET_SOFTBODY_LIBRARY}) message( "BULLET INVERSE DYNAMICS: " ${BULLET_INVERSEDYNAMICS_LIBRARY} ) message( "BULLET DYNAMICS: " ${BULLET_DYNAMICS_LIBRARY} ) message( "BULLET COLLISION: " ${BULLET_COLLISION_LIBRARY} ) message( "BULLET GEOMETRY: " ${BULLET3_GEOMETRY_LIBRARY} ) message( "BULLET3 DYNAMICS: " ${BULLET3_DYNAMICS_LIBRARY} ) message( "BULLET3 COLLISION: " ${BULLET3_COLLISION_LIBRARY} ) message( "BULLET3 COMMON: " ${BULLET3_COMMON_LIBRARY} ) message( "BULLET3 LINEARMATH: " ${BULLET3_LINEARMATH_LIBRARY} ) message( "-- BULLET INCLUDE: " ${BULLET_INCLUDE_DIR} ) message( "-- BULLET OPENCL: " ${BULLET_OPENCL_LIBRARY} ) message( "-- BULLET SOFTBODY: " ${BULLET_SOFTBODY_LIBRARY}) message( "-- BULLET INVERSE DYNAMICS: " ${BULLET_INVERSEDYNAMICS_LIBRARY} ) message( "-- BULLET DYNAMICS: " ${BULLET_DYNAMICS_LIBRARY} ) message( "-- BULLET COLLISION: " ${BULLET_COLLISION_LIBRARY} ) message( "-- BULLET GEOMETRY: " ${BULLET3_GEOMETRY_LIBRARY} ) message( "-- BULLET3 DYNAMICS: " ${BULLET3_DYNAMICS_LIBRARY} ) message( "-- BULLET3 COLLISION: " ${BULLET3_COLLISION_LIBRARY} ) message( "-- BULLET3 COMMON: " ${BULLET3_COMMON_LIBRARY} ) message( "-- BULLET3 LINEARMATH: " ${BULLET3_LINEARMATH_LIBRARY} )
isis/cmake/FindCSPICE.cmake +2 −2 Original line number Diff line number Diff line Loading @@ -14,5 +14,5 @@ find_library(CSPICE_LIBRARY NAMES cspice ) message( "CSPICE INCLUDE: " ${CSPICE_INCLUDE_DIR} ) message( "CSPICE LIB: " ${CSPICE_LIBRARY} ) message( "-- CSPICE INCLUDE: " ${CSPICE_INCLUDE_DIR} ) message( "-- CSPICE LIB: " ${CSPICE_LIBRARY} )
