Loading environment.yml +124 −102 Original line number Diff line number Diff line name: isisdeps name: isis channels: - anaconda - inria-pro-sed - krodriguez - conda-forge - usgs-astrogeology - conda-forge - probcomp - anaconda - jlaura - defaults dependencies: - libgcc=4.8.5=1 - blas=1.1=openblas - boost=1.65.1=py27_0 - boost-cpp=1.65.1=1 - bzip2=1.0.6=1 - ca-certificates=2018.1.18=0 - cairo=1.14.6=4 - certifi=2018.1.18=py27_0 - cmake=3.9.1=0 - cspice=66=0 - curl=7.55.1=0 - dbus=1.10.22=0 - doxygen=1.8.14=0 - eigen=3.3.3=0 - expat=2.2.5=0 - ffmpeg=3.2.4=3 - flann=1.8.4=0 - fontconfig=2.12.1=4 - freetype=2.7=1 - geos=3.5.1=1 - geotiff=1.4.2=1 - gettext=0.19.8.1=0 - giflib=5.1.4=0 - glib=2.51.4=0 - gsl=2.2.1=blas_openblas_3 - harfbuzz=1.3.4=2 - hdf5=1.8.18=3 - icu=58.2=0 - jasper=1.900.1=4 - jpeg=9b=2 - krb5=1.14.2=0 - lapack=3.6.1=1 - libffi=3.2.1=3 - libgfortran=3.0.0=0 - libiconv=1.15=0 - libpng=1.6.28=2 - libssh2=1.8.0=2 - libtiff=4.0.9=0 - libuv=1.11.0=0 - libwebp=0.5.2=7 - libxcb=1.12=1 - libxml2=2.9.7=0 - m4=1.4.17=1 - metis=5.1.0=3 - nanoflann=1.2.2=0 - ncurses=5.9=10 - ninja=1.7.2=0 - nn=1.86.0=2 - numpy=1.13.3=py27_blas_openblas_200 - openblas=0.2.19=2 - opencv=3.3.0=py27_blas_openblas_200 - openssl=1.0.2n=0 - pcre=8.39=0 - pip=9.0.1=py27_1 - pixman=0.34.0=1 - proj4=4.9.3=5 - protobuf=3.2.0=py27_0 - python=2.7.14=4 - qt=5.6.2=h9e3eb04_4 - qwt=6.1.3=1 - readline=7.0=0 - rhash=1.3.4=0 - ca-certificates==2017.08.26=h1d4fec5_0 - dbus==1.10.20=0 - future==0.16.0=y27_1 - gst-plugins-base=1.8.0=0 - gstreamer==1.8.0=0 - jsoncpp==1.8.3=h3a67955_0 - libgcc==4.8.5=1 - libgcc-ng==7.2.0=h7cc24e2_2 - libgfortran==3.0=0 - libstdcxx-ng==7.2.0=h7a57d05_2 - libxcb==1.12=1 - mysql==5.7.20=h55eaa98_0 - ncurses==5.9=10 - ninja==1.7.2=0 - patchelf==0.9=hf79760b_2 - pip==9.0.1=py27_1 - setuptools=38.5.1=py27_0 - six=1.11.0=py27_1 - sqlite=3.20.1=2 - suitesparse=4.5.4=blas_openblas_200 - superlu=5.2.1=blas_openblas_201 - tk=8.6.7=0 - wheel=0.30.0=py27_2 - x264=20131217=3 - xorg-kbproto=1.0.7=1 - xorg-libx11=1.6.4=6 - xorg-libxau=1.0.8=3 - xorg-libxdmcp=1.1.2=3 - xorg-xproto=7.0.31=6 - xz=5.2.3=0 - zlib=1.2.11=0 - openmpi=1.8.6=4 - parmetis=4.0.3p2=1 - jama=125=0 - tnt=126=0 - bullet=2.86.1=he2aa7b0_0 - ds9=7.5=h35e3669_0 - embree=2.16.0=h6834224_0 - gmm=5.0=h6aef312_0 - naif=n0066 - patchelf=0.9=h879b6ae_0 - pcl=1.8.1=h7a71350_0 - qhull=7.2.0=h396fa31_0 - tbb=4.4=hf7780a4_0 - vtk=7.1.1=py27h56fd973_0 - xalan-c=1.11=h1922a5c_0 - xerces-c=3.1.4=h10f7eb2_0 prefix: /Users/krodriguez-pr/anaconda3/envs/isisdeps - wheel==0.30.0=py27h2bc6bb2_1 - xerces-c==3.1.4=0 - xz==5.2.3=0 - zlib==1.2.11=0 - blas==1.1=openblas - boost==1.65.1=py27_0 - boost-cpp==1.65.1=1 - bzip2==1.0.6=1 - cairo==1.14.6=4 - certifi==2018.1.18=py27_0 - cmake==3.9.1=0 - cspice==66=0 - curl==7.55.1=0 - doxygen==1.8.14=0 - eigen==3.3.3=0 - embree==2.14.0=0 - expat==2.2.5=0 - ffmpeg==3.2.4=3 - flann==1.8.4=0 - fontconfig==2.12.1=4 - freeglut==3.0.0=4 - freetype==2.7=1 - geos==3.5.1=1 - geotiff==1.4.2=1 - gettext==0.19.8.1=0 - giflib==5.1.4=0 - glib==2.51.4=0 - gmp==6.1.2=0 - gsl==2.2.1=blas_openblas_3 - harfbuzz==1.3.4=2 - hdf5==1.8.18=2 - icu==58.2=0 - jasper==1.900.1=1 - jbig==2.1=0 - jpeg==9b=2 - krb5==1.14.2=0 - lapack==3.6.1=1 - libffi==3.2.1=3 - libiconv==1.15=0 - libpng==1.6.28=2 - libssh2==1.8.0=2 - libtiff==4.0.9=0 - libuv==1.11.0=0 - libwebp==0.5.2=7 - libxml2==2.9.7=0 - llvm-meta==5.0.0=0 - llvmdev==5.0.0=default_1 - m4==1.4.17=1 - mesalib==17.2.0=0 - metis==5.1.0=3 - mpc==1.0.3=4 - mpfr==3.1.5=0 - mysql-connector-c==6.1.6=0 - nanoflann==1.2.2=0 - nn==1.86.0=2 - numpy==1.13.3=py27_blas_openblas_200 - openblas==0.2.19=2 - opencv==3.2.0=np113py27_blas_openblas_203 - openssl==1.0.2n=0 - pcre==8.39=0 - pixman==0.34.0=1 - proj4==4.9.3=5 - pthread-stubs==0.3=1 - python==2.7.14=2 - readline==6.2=0 - rhash==1.3.4=0 - six==1.11.0=py27_1 - sqlite==3.13.0=1 - suitesparse==4.5.4=blas_openblas_200 - superlu==5.2.1=blas_openblas_201 - tbb==4.4_20160526=1 - tk==8.5.19=2 - vtk==8.1.0=py27_mesalib_0 - x264==20131217=3 - xorg-kbproto==1.0.7=1 - xorg-libx11==1.6.4=6 - xorg-libxau==1.0.8=3 - xorg-libxdmcp==1.1.2=3 - xorg-libxrender==0.9.10=0 - xorg-renderproto==0.11.1=1 - xorg-xproto==7.0.31=6 - bz2file==0.98=py27_0 - cloog==0.18.0=0 - gcc==4.8.5=7 - isl==0.12.2=0 - protobuf==2.6.1=py27_1 - system==5.8=2 - libprotobuf==2.6.1=0 - bullet==2.86.1=0 - ds9==7.5=0 - gmm==5.0=0 - jama==125=0 - pcl==1.8.1=0 - qhull==7.2.0=0 - qt==5.7.1=0 - qwt==6.1.3=0 - tnt==126=0 - xalan-c==1.11=0 prefix: /scratch/anaconda3/envs/isis isis/CMakeLists.txt +18 −17 Original line number Diff line number Diff line Loading @@ -58,7 +58,9 @@ message("Detected Operating System: ${osVersionString}") 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) # on linux, add the conda prefix to handle possible issues with rpaths at link time # sometimes third parties do not set their rpaths correctly set(thirdPartyCppFlags -Wall -std=c++11 -DISIS_LITTLE_ENDIAN=1 -fPIC -Wno-unused-parameter -Wno-overloaded-virtual -Wl,-rpath,$ENV{CONDA_PREFIX}/lib) # Specify user options that can be passed in with the initial CMake command. option(isis3Data "Directory containing Isis3Data" OFF ) Loading @@ -71,6 +73,14 @@ option(buildTests "Set up unit, application, and module tests." ON ) option(JP2KFLAG "Whether or not to build using JPEG2000 support" ON ) option(develop "Use a devleopment configuration" ON ) # if cmake install prefix is not set, and conda env is activated, use the # conda env as the install directory if(DEFINED ENV{CONDA_PREFIX} AND CMAKE_INSTALL_PREFIX STREQUAL "/usr/local") set(CMAKE_INSTALL_PREFIX $ENV{CONDA_PREFIX}) endif() message("Installing in: ${CMAKE_INSTALL_PREFIX}") # 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) Loading @@ -80,9 +90,11 @@ 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}) set(isis3Data ON) endif() if(DEFINED ENV{ISIS3TESTDATA} AND NOT isis3TestData) set(isis3TestData $ENV{ISIS3TESTDATA}) set(isis3TestData ON) endif() if(EXISTS ${isis3Data}) Loading Loading @@ -150,11 +162,11 @@ set(CORE_LIB_NAME isis3) # Specify relative library include paths which will be set up on # the installed files. if(APPLE) set(CMAKE_INSTALL_RPATH "@loader_path/../lib;@loader_path/../3rdParty/lib") set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};@loader_path/../lib;@loader_path/../3rdParty/lib") else() set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib;$ORIGIN/../3rdParty/lib") set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};$ORIGIN/../lib;$ORIGIN/../3rdParty/lib") endif() set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # We will set up some links with these files at the end of the install process so # make sure they are cleared at the start of the install process. Loading Loading @@ -200,18 +212,7 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/make DESTINATION ${CMAKE_INSTALL_PREFIX}) add_subdirectory(src objects) # Set up third party libraries for installation install_third_party() # # Create a link from the build/objects directory to each folder in 3rdPartyLibs/plugins. # # - This is required so that the plugins can be found during unit tests. # # TIP: Set "export QT_DEBUG_PLUGINS=1" to help debug plugin errors. # foreach(plugin ${THIRDPARTYPLUGINFOLDERS}) # get_filename_component(pluginName ${plugin} NAME) # if(NOT EXISTS ${CMAKE_BINARY_DIR}/lib/${pluginName}) # execute_process(COMMAND ln -s "${plugin}" ${pluginName} # WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/lib") # endif() # endforeach() # install_third_party() # Set up documentation build target. # - This script is called by running "make docs". Loading isis/cmake/AddIsisModule.cmake +2 −3 Original line number Diff line number Diff line Loading @@ -62,8 +62,6 @@ function(add_isis_app folder libDependencies) endfunction(add_isis_app) # Set up the lone unit test in an obj folder function(make_obj_unit_test moduleName testFile truthFile reqLibs pluginLibs) Loading @@ -89,7 +87,7 @@ function(make_obj_unit_test moduleName testFile truthFile reqLibs pluginLibs) target_link_libraries(${executableName} ${moduleName} ${depLibs}) # Call function to add the test add_unit_test_target(${executableName} ${truthFile}) add_unit_test_target(${executableName} ${truthFile} ${moduleName}) endfunction(make_obj_unit_test) Loading Loading @@ -273,6 +271,7 @@ function(add_isis_module name) foreach(val RANGE ${numTests}) list(GET unitTestFiles ${val} testFile ) list(GET truthFiles ${val} truthFile) make_obj_unit_test(${name} ${testFile} ${truthFile} "${reqLibs}" "${pluginLibs}") endforeach() endif() Loading isis/cmake/FindAllDependencies.cmake +35 −147 Original line number Diff line number Diff line Loading @@ -4,45 +4,9 @@ # go looking for them if they are not? #=============================================================================== message("CONDA PREFIX: $ENV{CONDA_PREFIX}") message("USING CONDA PREFIX: $ENV{CONDA_PREFIX}") list(APPEND CMAKE_FIND_ROOT_PATH $ENV{CONDA_PREFIX} $ENV{CONDA_PREFIX}/lib/cmake/Qt5) # Add search USGS maintained libraries 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/googleprotobuf/protobuf2.6.1/ /usgs/pkgs/local/v007/include/xercesc/xercesc3.1.2/ /usgs/pkgs/local/v007/include/tiff/tiff4.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/ ) # Add thirdPartyCppFlags set(thirdPartyCppFlags ${thirdPartyCppFlags} -DGMM_USES_SUPERLU) set(thirdPartyCppFlags ${thirdPartyCppFlags} "-DENABLEJP2K=${JP2KFLAG}") Loading @@ -61,24 +25,19 @@ find_program(MOC moc REQUIRED) find_program(RCC rcc REQUIRED) find_program(PROTOC protoc REQUIRED) if(APPLE) find_package(OpenGL REQUIRED) find_package(Qt5 COMPONENTS Core Concurrent # DBus Gui Multimedia MultimediaWidgets Network OpenGL # Needed to install mesa-common-dev for this! # Positioning PrintSupport Qml Quick Script ScriptTools # Sensors Sql Svg Test Loading @@ -88,98 +47,41 @@ if(APPLE) Widgets Xml XmlPatterns REQUIRED) else() # oh god why find_path(QT5_CORE_INCLUDE_DIR NAMES qchar.h PATH_SUFFIXES qt/qt5.7.1/QtCore/) find_path(QT5_CONCURRENT_INCLUDE_DIR NAMES qtconcurrentmap.h PATH_SUFFIXES qt/qt5.7.1/QtConcurrent) find_path(QT5_DBUS_INCLUDE_DIR NAMES qdbusmacros.h PATH_SUFFIXES qt/qt5.7.1/QtDBus) find_path(QT5_GUI_INCLUDE_DIR NAMES qpainter.h PATH_SUFFIXES qt/qt5.7.1/QtGui) find_path(QT5_MULTIMEDIA_INCLUDE_DIR NAMES qmediacontent.h PATH_SUFFIXES qt/qt5.7.1/QtMultimedia) find_path(QT5_MULTIMEDIAWIDGETS_INCLUDE_DIR NAMES qvideowidget.h PATH_SUFFIXES qt/qt5.7.1/QtMultimediaWidgets) find_path(QT5_NETWORK_INCLUDE_DIR NAMES qsslsocket.h PATH_SUFFIXES qt/qt5.7.1/QtNetwork) find_path(QT5_OPENGL_INCLUDE_DIR NAMES qtopenglglobal.h PATH_SUFFIXES qt/qt5.7.1/QtOpenGL) find_path(QT5_POSITIONING_INCLUDE_DIR NAMES qgeocoordinate.h PATH_SUFFIXES qt/qt5.7.1/QtPositioning) find_path(QT5_PRINTSUPPORT_INCLUDE_DIR NAMES qprinter.h PATH_SUFFIXES qt/qt5.7.1/QtPrintSupport) find_path(QT5_QML_INCLUDE_DIR NAMES qqmlinfo.h PATH_SUFFIXES qt/qt5.7.1/QtQml) find_path(QT5_QUICK_INCLUDE_DIR NAMES qquickview.h PATH_SUFFIXES qt/qt5.7.1/QtQuick) # find_path(QT5_SCRIPT_INCLUDE_DIR NAMES qscriptengine.h PATH_SUFFIXES qt/qt5.7.1/QtScript) #find_path(QT5_SCRIPTTOOLS_INCLUDE_DIR NAMES qtscripttoolsversion.h PATH_SUFFIXES qt/qt5.7.1/QtScriptTools) find_path(QT5_SENSORS_INCLUDE_DIR NAMES qgyroscope.h PATH_SUFFIXES qt/qt5.7.1/QtSensors) find_path(QT5_SQL_INCLUDE_DIR NAMES qsql.h PATH_SUFFIXES qt/qt5.7.1/QtSql) find_path(QT5_SVG_INCLUDE_DIR NAMES qsvgwidget.h PATH_SUFFIXES qt/qt5.7.1/QtSvg) find_path(QT5_TEST_INCLUDE_DIR NAMES qtest.h PATH_SUFFIXES qt/qt5.7.1/QtTest) find_path(QT5_WEBCHANNEL_INCLUDE_DIR NAMES qwebchannel.h PATH_SUFFIXES qt/qt5.7.1/QtWebChannel) find_path(QT5_WEBENGINE_INCLUDE_DIR NAMES qtwebengineglobal.h PATH_SUFFIXES qt/qt5.7.1/QtWebEngine) find_path(QT5_WEBENGINEWIDGETS_INCLUDE_DIR NAMES qwebenginescript.h PATH_SUFFIXES qt/qt5.7.1/QtWebEngineWidgets) find_path(QT5_WIDGETS_INCLUDE_DIR NAMES qwidget.h PATH_SUFFIXES qt/qt5.7.1/QtWidgets) find_path(QT5_XML_INCLUDE_DIR NAMES qxml.h PATH_SUFFIXES qt/qt5.7.1/QtXml) find_path(QT5_XMLPATTERNS_INCLUDE_DIR NAMES qtxmlpatternsglobal.h PATH_SUFFIXES qt/qt5.7.1/QtXmlPatterns) get_filename_component(QT5_ROOT_INCLUDE_DIR "${QT5_CORE_INCLUDE_DIR}" DIRECTORY) find_library(QT5_CORE_LIBRARY NAMES Qt5Core) find_library(QT5_CONCURRENT_LIBRARY NAMES Qt5Concurrent) find_library(QT5_DBUS_LIBRARY NAMES Qt5DBus) find_library(QT5_GUI_LIBRARY NAMES Qt5Gui) find_library(QT5_MULTIMEDIA_LIBRARY NAMES Qt5Multimedia) find_library(QT5_MULTIMEDIAWIDGETS_LIBRARY NAMES Qt5MultimediaWidgets) find_library(QT5_NETWORK_LIBRARY NAMES Qt5Network) find_library(QT5_OPENGL_LIBRARY NAMES Qt5OpenGL) find_library(QT5_POSITIONING_LIBRARY NAMES Qt5Positioning) find_library(QT5_PRINTSUPPORT_LIBRARY NAMES Qt5PrintSupport) find_library(QT5_QML_LIBRARY NAMES Qt5Qml) find_library(QT5_QUICK_LIBRARY NAMES Qt5Quick) find_library(QT5_SCRIPT_LIBRARY NAMES Qt5Script) find_library(QT5_SCRIPTTOOLS_LIBRARY NAMES Qt5ScriptTools) find_library(QT5_SENSORS_LIBRARY NAMES Qt5Sensors) find_library(QT5_SQL_LIBRARY NAMES Qt5Sql) find_library(QT5_SVG_LIBRARY NAMES Qt5Svg) find_library(QT5_TEST_LIBRARY NAMES Qt5Test) find_library(QT5_WEBCHANNEL_LIBRARY NAMES Qt5WebChannel) find_library(QT5_WEBENGINE_LIBRARY NAMES Qt5WebEngine) find_library(QT5_WEBENGINECORE_LIBRARY NAMES Qt5WebEngineCore) find_library(QT5_WEBENGINEWIDGETS_LIBRARY NAMES Qt5WebEngineWidgets) find_library(QT5_WIDGETS_LIBRARY NAMES Qt5Widgets) find_library(QT5_XML_LIBRARY NAMES Qt5Xml) find_library(QT5_XMLPATTERNS_LIBRARY NAMES Qt5XmlPatterns) endif(APPLE) # 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(Boost 1.59.0 REQUIRED) find_package(Bullet 2.86 REQUIRED) find_package(Cholmod 4.4.5 REQUIRED) # "SuiteSparse/SuiteSparse${Cholmod_FIND_VERSION}/SuiteSparse/" find_package(Cholmod 4.4.5 REQUIRED) find_package(CSPICE 65 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(GMM 5.0 REQUIRED) find_package(GSL 19 REQUIRED) find_package(HDF5 1.8.15 REQUIRED) find_package(Jama 125 REQUIRED) # Jama version is 1.2.5, but v007 directory is "jama/jama125/" find_package(Jama 125 REQUIRED) find_package(NN 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(PCL 1.8 REQUIRED) find_package(Protobuf 2.6.1 REQUIRED) find_package(Qwt 6 REQUIRED) find_package(SuperLU 4.3 REQUIRED) find_package(TIFF 4.0.5 REQUIRED) find_package(TNT 126 REQUIRED) find_package(XercesC 3.1.2 REQUIRED) find_package(X11 6 REQUIRED) find_package(nanoflann REQUIRED) find_package(PNG REQUIRED) find_package(Kakadu) find_package(Geos 3.5.0 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) find_package(OpenGL REQUIRED) else(APPLE) find_package(Geos 3.5.1 REQUIRED) endif(APPLE) get_cmake_property(_variableNames VARIABLES) # Get All VARIABLES Loading @@ -194,8 +96,6 @@ endforeach() foreach (_variableName ${_variableNames}) if (_variableName MATCHES "^CMAKE+") elseif (_variableName MATCHES "^BULLET$") # We need to skip Bullet since the order needs to be very specific elseif (_variableName MATCHES ".+_LIB$") list(APPEND ALLLIBS "${${_variableName}}") elseif (_variableName MATCHES ".+_LIBRARY$") Loading @@ -205,17 +105,6 @@ foreach (_variableName ${_variableNames}) endif() endforeach() list(APPEND ALLLIBS "${BULLET_OPENCL_LIBRARY}") list(APPEND ALLLIBS "${BULLET3_COMMON_LIBRARY}") list(APPEND ALLLIBS "${BULLET3_GEOMETRY_LIBRARY}") list(APPEND ALLLIBS "${BULLET_SOFTBODY_LIBRARY}") list(APPEND ALLLIBS "${BULLET_DYNAMICS_LIBRARY}") list(APPEND ALLLIBS "${BULLET3_3DYNAMICS_LIBRARY}") list(APPEND ALLLIBS "${BULLET_INVERSEDYNAMICS_LIBRARY}") list(APPEND ALLLIBS "${BULLET_COLLISION_LIBRARY}") list(APPEND ALLLIBS "${BULLET3_3COLLISION_LIBRARY}") list(APPEND ALLLIBS "${BULLET3_LINEARMATH_LIBRARY}") foreach (_variableName ${_variableNames}) get_filename_component(LIBDIR "${${_variableName}}" DIRECTORY) if (_variableName MATCHES "^CMAKE+") Loading @@ -231,4 +120,3 @@ endforeach() list(REMOVE_DUPLICATES ALLLIBDIRS) list(REMOVE_DUPLICATES ALLLIBS) list(REMOVE_DUPLICATES ALLINCDIRS) isis/cmake/FindBoost.cmake +0 −8 Original line number Diff line number Diff line Loading @@ -136,11 +136,3 @@ find_library(BOOST_RANDOM_MT_LIBRARY 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 ) Loading
environment.yml +124 −102 Original line number Diff line number Diff line name: isisdeps name: isis channels: - anaconda - inria-pro-sed - krodriguez - conda-forge - usgs-astrogeology - conda-forge - probcomp - anaconda - jlaura - defaults dependencies: - libgcc=4.8.5=1 - blas=1.1=openblas - boost=1.65.1=py27_0 - boost-cpp=1.65.1=1 - bzip2=1.0.6=1 - ca-certificates=2018.1.18=0 - cairo=1.14.6=4 - certifi=2018.1.18=py27_0 - cmake=3.9.1=0 - cspice=66=0 - curl=7.55.1=0 - dbus=1.10.22=0 - doxygen=1.8.14=0 - eigen=3.3.3=0 - expat=2.2.5=0 - ffmpeg=3.2.4=3 - flann=1.8.4=0 - fontconfig=2.12.1=4 - freetype=2.7=1 - geos=3.5.1=1 - geotiff=1.4.2=1 - gettext=0.19.8.1=0 - giflib=5.1.4=0 - glib=2.51.4=0 - gsl=2.2.1=blas_openblas_3 - harfbuzz=1.3.4=2 - hdf5=1.8.18=3 - icu=58.2=0 - jasper=1.900.1=4 - jpeg=9b=2 - krb5=1.14.2=0 - lapack=3.6.1=1 - libffi=3.2.1=3 - libgfortran=3.0.0=0 - libiconv=1.15=0 - libpng=1.6.28=2 - libssh2=1.8.0=2 - libtiff=4.0.9=0 - libuv=1.11.0=0 - libwebp=0.5.2=7 - libxcb=1.12=1 - libxml2=2.9.7=0 - m4=1.4.17=1 - metis=5.1.0=3 - nanoflann=1.2.2=0 - ncurses=5.9=10 - ninja=1.7.2=0 - nn=1.86.0=2 - numpy=1.13.3=py27_blas_openblas_200 - openblas=0.2.19=2 - opencv=3.3.0=py27_blas_openblas_200 - openssl=1.0.2n=0 - pcre=8.39=0 - pip=9.0.1=py27_1 - pixman=0.34.0=1 - proj4=4.9.3=5 - protobuf=3.2.0=py27_0 - python=2.7.14=4 - qt=5.6.2=h9e3eb04_4 - qwt=6.1.3=1 - readline=7.0=0 - rhash=1.3.4=0 - ca-certificates==2017.08.26=h1d4fec5_0 - dbus==1.10.20=0 - future==0.16.0=y27_1 - gst-plugins-base=1.8.0=0 - gstreamer==1.8.0=0 - jsoncpp==1.8.3=h3a67955_0 - libgcc==4.8.5=1 - libgcc-ng==7.2.0=h7cc24e2_2 - libgfortran==3.0=0 - libstdcxx-ng==7.2.0=h7a57d05_2 - libxcb==1.12=1 - mysql==5.7.20=h55eaa98_0 - ncurses==5.9=10 - ninja==1.7.2=0 - patchelf==0.9=hf79760b_2 - pip==9.0.1=py27_1 - setuptools=38.5.1=py27_0 - six=1.11.0=py27_1 - sqlite=3.20.1=2 - suitesparse=4.5.4=blas_openblas_200 - superlu=5.2.1=blas_openblas_201 - tk=8.6.7=0 - wheel=0.30.0=py27_2 - x264=20131217=3 - xorg-kbproto=1.0.7=1 - xorg-libx11=1.6.4=6 - xorg-libxau=1.0.8=3 - xorg-libxdmcp=1.1.2=3 - xorg-xproto=7.0.31=6 - xz=5.2.3=0 - zlib=1.2.11=0 - openmpi=1.8.6=4 - parmetis=4.0.3p2=1 - jama=125=0 - tnt=126=0 - bullet=2.86.1=he2aa7b0_0 - ds9=7.5=h35e3669_0 - embree=2.16.0=h6834224_0 - gmm=5.0=h6aef312_0 - naif=n0066 - patchelf=0.9=h879b6ae_0 - pcl=1.8.1=h7a71350_0 - qhull=7.2.0=h396fa31_0 - tbb=4.4=hf7780a4_0 - vtk=7.1.1=py27h56fd973_0 - xalan-c=1.11=h1922a5c_0 - xerces-c=3.1.4=h10f7eb2_0 prefix: /Users/krodriguez-pr/anaconda3/envs/isisdeps - wheel==0.30.0=py27h2bc6bb2_1 - xerces-c==3.1.4=0 - xz==5.2.3=0 - zlib==1.2.11=0 - blas==1.1=openblas - boost==1.65.1=py27_0 - boost-cpp==1.65.1=1 - bzip2==1.0.6=1 - cairo==1.14.6=4 - certifi==2018.1.18=py27_0 - cmake==3.9.1=0 - cspice==66=0 - curl==7.55.1=0 - doxygen==1.8.14=0 - eigen==3.3.3=0 - embree==2.14.0=0 - expat==2.2.5=0 - ffmpeg==3.2.4=3 - flann==1.8.4=0 - fontconfig==2.12.1=4 - freeglut==3.0.0=4 - freetype==2.7=1 - geos==3.5.1=1 - geotiff==1.4.2=1 - gettext==0.19.8.1=0 - giflib==5.1.4=0 - glib==2.51.4=0 - gmp==6.1.2=0 - gsl==2.2.1=blas_openblas_3 - harfbuzz==1.3.4=2 - hdf5==1.8.18=2 - icu==58.2=0 - jasper==1.900.1=1 - jbig==2.1=0 - jpeg==9b=2 - krb5==1.14.2=0 - lapack==3.6.1=1 - libffi==3.2.1=3 - libiconv==1.15=0 - libpng==1.6.28=2 - libssh2==1.8.0=2 - libtiff==4.0.9=0 - libuv==1.11.0=0 - libwebp==0.5.2=7 - libxml2==2.9.7=0 - llvm-meta==5.0.0=0 - llvmdev==5.0.0=default_1 - m4==1.4.17=1 - mesalib==17.2.0=0 - metis==5.1.0=3 - mpc==1.0.3=4 - mpfr==3.1.5=0 - mysql-connector-c==6.1.6=0 - nanoflann==1.2.2=0 - nn==1.86.0=2 - numpy==1.13.3=py27_blas_openblas_200 - openblas==0.2.19=2 - opencv==3.2.0=np113py27_blas_openblas_203 - openssl==1.0.2n=0 - pcre==8.39=0 - pixman==0.34.0=1 - proj4==4.9.3=5 - pthread-stubs==0.3=1 - python==2.7.14=2 - readline==6.2=0 - rhash==1.3.4=0 - six==1.11.0=py27_1 - sqlite==3.13.0=1 - suitesparse==4.5.4=blas_openblas_200 - superlu==5.2.1=blas_openblas_201 - tbb==4.4_20160526=1 - tk==8.5.19=2 - vtk==8.1.0=py27_mesalib_0 - x264==20131217=3 - xorg-kbproto==1.0.7=1 - xorg-libx11==1.6.4=6 - xorg-libxau==1.0.8=3 - xorg-libxdmcp==1.1.2=3 - xorg-libxrender==0.9.10=0 - xorg-renderproto==0.11.1=1 - xorg-xproto==7.0.31=6 - bz2file==0.98=py27_0 - cloog==0.18.0=0 - gcc==4.8.5=7 - isl==0.12.2=0 - protobuf==2.6.1=py27_1 - system==5.8=2 - libprotobuf==2.6.1=0 - bullet==2.86.1=0 - ds9==7.5=0 - gmm==5.0=0 - jama==125=0 - pcl==1.8.1=0 - qhull==7.2.0=0 - qt==5.7.1=0 - qwt==6.1.3=0 - tnt==126=0 - xalan-c==1.11=0 prefix: /scratch/anaconda3/envs/isis
isis/CMakeLists.txt +18 −17 Original line number Diff line number Diff line Loading @@ -58,7 +58,9 @@ message("Detected Operating System: ${osVersionString}") 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) # on linux, add the conda prefix to handle possible issues with rpaths at link time # sometimes third parties do not set their rpaths correctly set(thirdPartyCppFlags -Wall -std=c++11 -DISIS_LITTLE_ENDIAN=1 -fPIC -Wno-unused-parameter -Wno-overloaded-virtual -Wl,-rpath,$ENV{CONDA_PREFIX}/lib) # Specify user options that can be passed in with the initial CMake command. option(isis3Data "Directory containing Isis3Data" OFF ) Loading @@ -71,6 +73,14 @@ option(buildTests "Set up unit, application, and module tests." ON ) option(JP2KFLAG "Whether or not to build using JPEG2000 support" ON ) option(develop "Use a devleopment configuration" ON ) # if cmake install prefix is not set, and conda env is activated, use the # conda env as the install directory if(DEFINED ENV{CONDA_PREFIX} AND CMAKE_INSTALL_PREFIX STREQUAL "/usr/local") set(CMAKE_INSTALL_PREFIX $ENV{CONDA_PREFIX}) endif() message("Installing in: ${CMAKE_INSTALL_PREFIX}") # 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) Loading @@ -80,9 +90,11 @@ 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}) set(isis3Data ON) endif() if(DEFINED ENV{ISIS3TESTDATA} AND NOT isis3TestData) set(isis3TestData $ENV{ISIS3TESTDATA}) set(isis3TestData ON) endif() if(EXISTS ${isis3Data}) Loading Loading @@ -150,11 +162,11 @@ set(CORE_LIB_NAME isis3) # Specify relative library include paths which will be set up on # the installed files. if(APPLE) set(CMAKE_INSTALL_RPATH "@loader_path/../lib;@loader_path/../3rdParty/lib") set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};@loader_path/../lib;@loader_path/../3rdParty/lib") else() set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib;$ORIGIN/../3rdParty/lib") set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};$ORIGIN/../lib;$ORIGIN/../3rdParty/lib") endif() set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # We will set up some links with these files at the end of the install process so # make sure they are cleared at the start of the install process. Loading Loading @@ -200,18 +212,7 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/make DESTINATION ${CMAKE_INSTALL_PREFIX}) add_subdirectory(src objects) # Set up third party libraries for installation install_third_party() # # Create a link from the build/objects directory to each folder in 3rdPartyLibs/plugins. # # - This is required so that the plugins can be found during unit tests. # # TIP: Set "export QT_DEBUG_PLUGINS=1" to help debug plugin errors. # foreach(plugin ${THIRDPARTYPLUGINFOLDERS}) # get_filename_component(pluginName ${plugin} NAME) # if(NOT EXISTS ${CMAKE_BINARY_DIR}/lib/${pluginName}) # execute_process(COMMAND ln -s "${plugin}" ${pluginName} # WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/lib") # endif() # endforeach() # install_third_party() # Set up documentation build target. # - This script is called by running "make docs". Loading
isis/cmake/AddIsisModule.cmake +2 −3 Original line number Diff line number Diff line Loading @@ -62,8 +62,6 @@ function(add_isis_app folder libDependencies) endfunction(add_isis_app) # Set up the lone unit test in an obj folder function(make_obj_unit_test moduleName testFile truthFile reqLibs pluginLibs) Loading @@ -89,7 +87,7 @@ function(make_obj_unit_test moduleName testFile truthFile reqLibs pluginLibs) target_link_libraries(${executableName} ${moduleName} ${depLibs}) # Call function to add the test add_unit_test_target(${executableName} ${truthFile}) add_unit_test_target(${executableName} ${truthFile} ${moduleName}) endfunction(make_obj_unit_test) Loading Loading @@ -273,6 +271,7 @@ function(add_isis_module name) foreach(val RANGE ${numTests}) list(GET unitTestFiles ${val} testFile ) list(GET truthFiles ${val} truthFile) make_obj_unit_test(${name} ${testFile} ${truthFile} "${reqLibs}" "${pluginLibs}") endforeach() endif() Loading
isis/cmake/FindAllDependencies.cmake +35 −147 Original line number Diff line number Diff line Loading @@ -4,45 +4,9 @@ # go looking for them if they are not? #=============================================================================== message("CONDA PREFIX: $ENV{CONDA_PREFIX}") message("USING CONDA PREFIX: $ENV{CONDA_PREFIX}") list(APPEND CMAKE_FIND_ROOT_PATH $ENV{CONDA_PREFIX} $ENV{CONDA_PREFIX}/lib/cmake/Qt5) # Add search USGS maintained libraries 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/googleprotobuf/protobuf2.6.1/ /usgs/pkgs/local/v007/include/xercesc/xercesc3.1.2/ /usgs/pkgs/local/v007/include/tiff/tiff4.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/ ) # Add thirdPartyCppFlags set(thirdPartyCppFlags ${thirdPartyCppFlags} -DGMM_USES_SUPERLU) set(thirdPartyCppFlags ${thirdPartyCppFlags} "-DENABLEJP2K=${JP2KFLAG}") Loading @@ -61,24 +25,19 @@ find_program(MOC moc REQUIRED) find_program(RCC rcc REQUIRED) find_program(PROTOC protoc REQUIRED) if(APPLE) find_package(OpenGL REQUIRED) find_package(Qt5 COMPONENTS Core Concurrent # DBus Gui Multimedia MultimediaWidgets Network OpenGL # Needed to install mesa-common-dev for this! # Positioning PrintSupport Qml Quick Script ScriptTools # Sensors Sql Svg Test Loading @@ -88,98 +47,41 @@ if(APPLE) Widgets Xml XmlPatterns REQUIRED) else() # oh god why find_path(QT5_CORE_INCLUDE_DIR NAMES qchar.h PATH_SUFFIXES qt/qt5.7.1/QtCore/) find_path(QT5_CONCURRENT_INCLUDE_DIR NAMES qtconcurrentmap.h PATH_SUFFIXES qt/qt5.7.1/QtConcurrent) find_path(QT5_DBUS_INCLUDE_DIR NAMES qdbusmacros.h PATH_SUFFIXES qt/qt5.7.1/QtDBus) find_path(QT5_GUI_INCLUDE_DIR NAMES qpainter.h PATH_SUFFIXES qt/qt5.7.1/QtGui) find_path(QT5_MULTIMEDIA_INCLUDE_DIR NAMES qmediacontent.h PATH_SUFFIXES qt/qt5.7.1/QtMultimedia) find_path(QT5_MULTIMEDIAWIDGETS_INCLUDE_DIR NAMES qvideowidget.h PATH_SUFFIXES qt/qt5.7.1/QtMultimediaWidgets) find_path(QT5_NETWORK_INCLUDE_DIR NAMES qsslsocket.h PATH_SUFFIXES qt/qt5.7.1/QtNetwork) find_path(QT5_OPENGL_INCLUDE_DIR NAMES qtopenglglobal.h PATH_SUFFIXES qt/qt5.7.1/QtOpenGL) find_path(QT5_POSITIONING_INCLUDE_DIR NAMES qgeocoordinate.h PATH_SUFFIXES qt/qt5.7.1/QtPositioning) find_path(QT5_PRINTSUPPORT_INCLUDE_DIR NAMES qprinter.h PATH_SUFFIXES qt/qt5.7.1/QtPrintSupport) find_path(QT5_QML_INCLUDE_DIR NAMES qqmlinfo.h PATH_SUFFIXES qt/qt5.7.1/QtQml) find_path(QT5_QUICK_INCLUDE_DIR NAMES qquickview.h PATH_SUFFIXES qt/qt5.7.1/QtQuick) # find_path(QT5_SCRIPT_INCLUDE_DIR NAMES qscriptengine.h PATH_SUFFIXES qt/qt5.7.1/QtScript) #find_path(QT5_SCRIPTTOOLS_INCLUDE_DIR NAMES qtscripttoolsversion.h PATH_SUFFIXES qt/qt5.7.1/QtScriptTools) find_path(QT5_SENSORS_INCLUDE_DIR NAMES qgyroscope.h PATH_SUFFIXES qt/qt5.7.1/QtSensors) find_path(QT5_SQL_INCLUDE_DIR NAMES qsql.h PATH_SUFFIXES qt/qt5.7.1/QtSql) find_path(QT5_SVG_INCLUDE_DIR NAMES qsvgwidget.h PATH_SUFFIXES qt/qt5.7.1/QtSvg) find_path(QT5_TEST_INCLUDE_DIR NAMES qtest.h PATH_SUFFIXES qt/qt5.7.1/QtTest) find_path(QT5_WEBCHANNEL_INCLUDE_DIR NAMES qwebchannel.h PATH_SUFFIXES qt/qt5.7.1/QtWebChannel) find_path(QT5_WEBENGINE_INCLUDE_DIR NAMES qtwebengineglobal.h PATH_SUFFIXES qt/qt5.7.1/QtWebEngine) find_path(QT5_WEBENGINEWIDGETS_INCLUDE_DIR NAMES qwebenginescript.h PATH_SUFFIXES qt/qt5.7.1/QtWebEngineWidgets) find_path(QT5_WIDGETS_INCLUDE_DIR NAMES qwidget.h PATH_SUFFIXES qt/qt5.7.1/QtWidgets) find_path(QT5_XML_INCLUDE_DIR NAMES qxml.h PATH_SUFFIXES qt/qt5.7.1/QtXml) find_path(QT5_XMLPATTERNS_INCLUDE_DIR NAMES qtxmlpatternsglobal.h PATH_SUFFIXES qt/qt5.7.1/QtXmlPatterns) get_filename_component(QT5_ROOT_INCLUDE_DIR "${QT5_CORE_INCLUDE_DIR}" DIRECTORY) find_library(QT5_CORE_LIBRARY NAMES Qt5Core) find_library(QT5_CONCURRENT_LIBRARY NAMES Qt5Concurrent) find_library(QT5_DBUS_LIBRARY NAMES Qt5DBus) find_library(QT5_GUI_LIBRARY NAMES Qt5Gui) find_library(QT5_MULTIMEDIA_LIBRARY NAMES Qt5Multimedia) find_library(QT5_MULTIMEDIAWIDGETS_LIBRARY NAMES Qt5MultimediaWidgets) find_library(QT5_NETWORK_LIBRARY NAMES Qt5Network) find_library(QT5_OPENGL_LIBRARY NAMES Qt5OpenGL) find_library(QT5_POSITIONING_LIBRARY NAMES Qt5Positioning) find_library(QT5_PRINTSUPPORT_LIBRARY NAMES Qt5PrintSupport) find_library(QT5_QML_LIBRARY NAMES Qt5Qml) find_library(QT5_QUICK_LIBRARY NAMES Qt5Quick) find_library(QT5_SCRIPT_LIBRARY NAMES Qt5Script) find_library(QT5_SCRIPTTOOLS_LIBRARY NAMES Qt5ScriptTools) find_library(QT5_SENSORS_LIBRARY NAMES Qt5Sensors) find_library(QT5_SQL_LIBRARY NAMES Qt5Sql) find_library(QT5_SVG_LIBRARY NAMES Qt5Svg) find_library(QT5_TEST_LIBRARY NAMES Qt5Test) find_library(QT5_WEBCHANNEL_LIBRARY NAMES Qt5WebChannel) find_library(QT5_WEBENGINE_LIBRARY NAMES Qt5WebEngine) find_library(QT5_WEBENGINECORE_LIBRARY NAMES Qt5WebEngineCore) find_library(QT5_WEBENGINEWIDGETS_LIBRARY NAMES Qt5WebEngineWidgets) find_library(QT5_WIDGETS_LIBRARY NAMES Qt5Widgets) find_library(QT5_XML_LIBRARY NAMES Qt5Xml) find_library(QT5_XMLPATTERNS_LIBRARY NAMES Qt5XmlPatterns) endif(APPLE) # 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(Boost 1.59.0 REQUIRED) find_package(Bullet 2.86 REQUIRED) find_package(Cholmod 4.4.5 REQUIRED) # "SuiteSparse/SuiteSparse${Cholmod_FIND_VERSION}/SuiteSparse/" find_package(Cholmod 4.4.5 REQUIRED) find_package(CSPICE 65 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(GMM 5.0 REQUIRED) find_package(GSL 19 REQUIRED) find_package(HDF5 1.8.15 REQUIRED) find_package(Jama 125 REQUIRED) # Jama version is 1.2.5, but v007 directory is "jama/jama125/" find_package(Jama 125 REQUIRED) find_package(NN 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(PCL 1.8 REQUIRED) find_package(Protobuf 2.6.1 REQUIRED) find_package(Qwt 6 REQUIRED) find_package(SuperLU 4.3 REQUIRED) find_package(TIFF 4.0.5 REQUIRED) find_package(TNT 126 REQUIRED) find_package(XercesC 3.1.2 REQUIRED) find_package(X11 6 REQUIRED) find_package(nanoflann REQUIRED) find_package(PNG REQUIRED) find_package(Kakadu) find_package(Geos 3.5.0 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) find_package(OpenGL REQUIRED) else(APPLE) find_package(Geos 3.5.1 REQUIRED) endif(APPLE) get_cmake_property(_variableNames VARIABLES) # Get All VARIABLES Loading @@ -194,8 +96,6 @@ endforeach() foreach (_variableName ${_variableNames}) if (_variableName MATCHES "^CMAKE+") elseif (_variableName MATCHES "^BULLET$") # We need to skip Bullet since the order needs to be very specific elseif (_variableName MATCHES ".+_LIB$") list(APPEND ALLLIBS "${${_variableName}}") elseif (_variableName MATCHES ".+_LIBRARY$") Loading @@ -205,17 +105,6 @@ foreach (_variableName ${_variableNames}) endif() endforeach() list(APPEND ALLLIBS "${BULLET_OPENCL_LIBRARY}") list(APPEND ALLLIBS "${BULLET3_COMMON_LIBRARY}") list(APPEND ALLLIBS "${BULLET3_GEOMETRY_LIBRARY}") list(APPEND ALLLIBS "${BULLET_SOFTBODY_LIBRARY}") list(APPEND ALLLIBS "${BULLET_DYNAMICS_LIBRARY}") list(APPEND ALLLIBS "${BULLET3_3DYNAMICS_LIBRARY}") list(APPEND ALLLIBS "${BULLET_INVERSEDYNAMICS_LIBRARY}") list(APPEND ALLLIBS "${BULLET_COLLISION_LIBRARY}") list(APPEND ALLLIBS "${BULLET3_3COLLISION_LIBRARY}") list(APPEND ALLLIBS "${BULLET3_LINEARMATH_LIBRARY}") foreach (_variableName ${_variableNames}) get_filename_component(LIBDIR "${${_variableName}}" DIRECTORY) if (_variableName MATCHES "^CMAKE+") Loading @@ -231,4 +120,3 @@ endforeach() list(REMOVE_DUPLICATES ALLLIBDIRS) list(REMOVE_DUPLICATES ALLLIBS) list(REMOVE_DUPLICATES ALLINCDIRS)
isis/cmake/FindBoost.cmake +0 −8 Original line number Diff line number Diff line Loading @@ -136,11 +136,3 @@ find_library(BOOST_RANDOM_MT_LIBRARY 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 )
