Commit a52259c6 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

removed uneeded opengl find script, now defaults to conda env if no install... 

removed uneeded opengl find script, now defaults to conda env if no install directory is set and conda env is activated
parent b24ea784

isis/CMakeLists.txt

+10 −0
Original line number Diff line number Diff line
@@ -71,6 +71,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)
@@ -80,9 +88,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})

isis/cmake/FindAllDependencies.cmake

+24 −134
Original line number Diff line number Diff line
@@ -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}")
@@ -61,23 +25,19 @@ find_program(MOC moc REQUIRED) 
find_program(RCC rcc REQUIRED)

find_program(PROTOC protoc REQUIRED)



if(APPLE)

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
@@ -87,60 +47,6 @@ 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
@@ -170,15 +76,12 @@ 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
@@ -193,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$")
@@ -204,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+")

isis/cmake/FindOpenGL.cmake

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

# Finds include directory and all applicable libraries

#

# Sets the following:

#   KAKADU_INCLUDE_DIR

#   KAKADU_A_LIBRARY

#   KAKADU_V_LIBRARY



find_path(OPENGL_INCLUDE_DIR

  NAME gl.h

  PATH_SUFFIXES GL

  HINTS GL

)



find_library(GL_LIBRARY

  NAMES GL

)



find_library(GLU_LIBRARY

  NAMES GLU

)



message( "-- OPENGL INCLUDE DIR: ${OPENGL_INCLUDE_DIR}")

message( "-- OPENGL LIB: ${GL_LIBRARY}")

message( "-- OPENGLU LIB: ${GLU_LIBRARY}")



get_filename_component(OPENGL_INCLUDE_DIR "${OPENGL_INCLUDE_DIR}" DIRECTORY)

isis/cmake/InstallThirdParty.cmake

+1 −2
Original line number Diff line number Diff line
@@ -11,8 +11,7 @@ function(install_third_party_libs) 


  # Loop through all the library files in our list

  foreach(library ${ALLLIBS})

    get_filename_component(extension ${library} EXT)

    if ("${extension}" STREQUAL ".so" OR "${extension}" STREQUAL ".dylib" )

    if (EXISTS ${library})

      #get path to library in libararypath

      get_filename_component(librarypath ${library} PATH)

isis/cmake/TestSetup.cmake

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ macro(add_makefile_test_target testName makeFile inputDir outputDir truthDir) 
           -DTRUTH_DIR=${truthDir}

           -DBIN_DIR=${CMAKE_BINARY_DIR}/bin

           -P ${thisFolder}/RunMakeFileTest.cmake)

  set_tests_properties(${testName} PROPERTIES LABELS "app")



endmacro()
@@ -78,4 +79,6 @@ macro(add_unit_test_target testFile truthFile) 
           -DDATA_ROOT=$ENV{ISIS3DATA}

           -DCODE_ROOT=${PROJECT_SOURCE_DIR}

           -P ${thisFolder}/RunUnitTest.cmake)



  set_tests_properties(${testName} PROPERTIES LABELS "unit")

endmacro()