Commit 78cc257b authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

cleaner dependencies

parent 553761bd

isis/cmake/FindAllDependencies.cmake

+2 −2
Original line number Diff line number Diff line
@@ -74,15 +74,15 @@ 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(nanoflann         REQUIRED)

find_package(png               REQUIRED)

find_package(PNG               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.

if(APPLE)

  find_package(Geos    3.5.0   REQUIRED)

  find_package(OpenGL            REQUIRED)

else(APPLE)

  find_package(Geos    3.5.1   REQUIRED)

endif(APPLE)

isis/cmake/FindBoost.cmake

+0 −4
Original line number Diff line number Diff line
@@ -129,10 +129,6 @@ 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

#)

find_library(BOOST_RANDOM_MT_LIBRARY

  NAMES boost_random-mt boost_random

)

isis/cmake/FindCholmod.cmake

+1 −1
Original line number Diff line number Diff line
@@ -44,5 +44,5 @@ message( "-- FORTRAN LIB: " ${FORTRAN_LIBRARY} ) 
message( "-- BLAS LIB: "  ${BLAS_LIBRARY} )



if(NOT APPLE)

  message("LAPACK LIB" ${LAPACK_LIBRARY})

  message("-- LAPACK LIB: " ${LAPACK_LIBRARY})

endif()

isis/cmake/InstallThirdParty.cmake

+0 −13
Original line number Diff line number Diff line
@@ -5,21 +5,10 @@ 
# Library portion of the installation

function(install_third_party_libs)







  # Where all the library files will go

  set(installLibFolder "${CMAKE_INSTALL_PREFIX}/3rdParty/lib")

  execute_process(COMMAND mkdir -p ${installLibFolder})



  # TEMPORARY CODE TO INSTALL ALL FILES FROM V007/lib into 3rdParty/lib

  if(APPLE)

    install(DIRECTORY "/opt/usgs/v007/3rdParty/lib" DESTINATION ${CMAKE_INSTALL_PREFIX})

    install(DIRECTORY "/opt/usgs/v007/ports/lib" DESTINATION ${CMAKE_INSTALL_PREFIX})

    install(DIRECTORY "/opt/usgs/v007/proprietary/lib" DESTINATION ${CMAKE_INSTALL_PREFIX})

  else()

    install(DIRECTORY "/usgs/pkgs/local/v007/lib" DESTINATION ${CMAKE_INSTALL_PREFIX})

  endif()



  # Loop through all the library files in our list

  foreach(library ${ALLLIBS})

    get_filename_component(extension ${library} EXT)
@@ -43,8 +32,6 @@ function(install_third_party_libs) 
  endif(APPLE)

endfunction()







# Plugin portion of the installation

function(install_third_party_plugins)

isis/src/base/objs/Environment/Environment.cpp

+0 −31
Original line number Diff line number Diff line
@@ -7,10 +7,6 @@ 
#include <QStringList>

#include <QCoreApplication>



#ifndef __APPLE__

#include <QtDBus>

#endif



#include "IException.h"

#include "IString.h"

#include "TextFile.h"
@@ -61,33 +57,6 @@ namespace Isis { 
      QCoreApplication::setLibraryPaths(pluginPaths);

    }

#endif



#ifndef __APPLE__

    // We need to force the correct QDBus library to be loaded... to do that, just

    //   use a symbol in it's library. This only applies to linux and fixes #1228.



    // Long explanation:

    //   When we run GUI apps, the system (and Qt) work together to figure out

    //   which runtime libraries are necessary on-the-fly. When QApplication is

    //   instantiated, it goes into QtGui's style code. The styles ignore our plugin

    //   path setting (above) on all OS's. So Qt GUI grabs a style from the OS's styles,

    //   which is a shared library in the kde area. These styles require a version (any version)

    //   of QtDBus loaded. If QtDBus is not yet loaded, then the style library will grab it.

    //   However, on Ubuntu 12.04, the style library grabs the system (OS) QDBus library. QDBus

    //   detects that you've already loaded Isis' QtCore, so the library versions mismatch, and

    //   it crashes. The problem becomes more interesting because sometimes it picks up the system

    //   QDBus, and sometimes it picks up Isis' QDBus, and I have no good reason why we pick up

    //   one versus another; currently, installed apps pick up the system and locally built apps

    //   pick up Isis' (even when the executables are made to be identical). The end result is no

    //   installed GUI applications will run and our automated tests fail to catch it. This solution

    //   bypasses the entire issue by forcing QDBus to be loaded long before any styles are loaded,

    //   so the style plugins do not need to go and get their own QDBus library.

    //

    //   The root cause is that Ubuntu's run time loader is failing to respect

    //   our executable's rpaths when loading a style library. However, when we link against the

    //   QBus library directly, we get the right one.

    QDBusArgument();

#endif

  }