Commit 7733379a authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

Fixed plugin error with CameraFactory appending to the master Camera.plugin file

parent 7e078c92

isis/CMakeLists.txt

+7 −1
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ set(CMAKE_PREFIX_PATH 
  /usr/local/lib

)



set(CMAKE_FIND_FRAMEWORK LAST)



include(AddIsisModule)

include(Utilities)

include(TestSetup)
@@ -68,6 +70,11 @@ set(PACKAGE_VERSION ${VERSION}) 
# Full name and version number

set(PACKAGE_STRING     "${PACKAGE_NAME} ${VERSION}")



# Other release information

set(VERSION_DATE              "2017-04-24")

set(THIRD_PARTY_LIBS_VERSION  "v007")

set(RELEASE_STAGE             "alpha") # (alpha, beta, stable)



# Define to the address where bug reports for this package should be sent.

set(PACKAGE_BUGREPORT  "https://isis.astrogeology.usgs.gov/fixit")
@@ -204,7 +211,6 @@ install(FILES "${CMAKE_BINARY_DIR}/qt.conf" DESTINATION ${CMAKE_INSTALL_PREFIX}/ 
#Create the inc directory

execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/inc)





# Create an xml folder in the source directory that we will need later

set(sourceXmlFolder ${CMAKE_BINARY_DIR}/bin/xml)

execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/xml)

isis/cmake/AddIsisModule.cmake

+2 −1
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ function(add_isis_obj folder reqLibs) 
    # Folder with a plugin means that this is a separate library!

    # Add it here and then we are done with the source files.

    

    set(newSourceFiles ${thisSourceFiles} PARENT_SCOPE)

    if(NOT (${numPlugins} EQUAL 1))

      message( FATAL_ERROR "Error: Multiple plugins found in folder!" )

    endif()

isis/cmake/FindAllDependencies.cmake

+8 −3
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ find_program(PROTOC protoc REQUIRED) 


include(FindProtobuf)





find_package(Geos 3.5.0 REQUIRED)





if(APPLE)

  find_package(Qt5 COMPONENTS

                  Core
@@ -124,7 +128,6 @@ find_package(GeoTIFF 2 REQUIRED) 
find_package(TIFF 5 REQUIRED)

find_package(CSPICE 65 REQUIRED)

find_package(TNT 1.2.6 REQUIRED)

find_package(Geos 3.5.0 REQUIRED)

find_package(GSL 19 REQUIRED)

find_package(Protobuf 9 REQUIRED)

find_package(Boost 1.59 REQUIRED)
@@ -142,6 +145,7 @@ find_package(OpenCV 3.1.0 REQUIRED) 
find_package(NN REQUIRED)

find_package(Jama REQUIRED)





# Only include Kakadu if it is available

if(${JP2KFLAG})

  find_package(Kakadu)
@@ -181,11 +185,13 @@ foreach (_variableName ${_variableNames}) 
    endif(_variableName MATCHES "^CMAKE+")

endforeach()



#list(APPEND ALLLIBDIRS "/usr/lib64")

list(REMOVE_DUPLICATES ALLLIBDIRS)

list(REMOVE_DUPLICATES ALLLIBS)

list(REMOVE_DUPLICATES ALLINCDIRS)



message(${ALLLIBS})

message(${ALLLIBDIRS})



# message(STATUS "ALL LIBS DIRS: ${ALLLIBDIRS}")

# message(STATUS "ALL LIBS: ${ALLLIBS}")

# message(STATUS "ALL INCS: ${ALLINCDIRS}")
@@ -319,7 +325,6 @@ set(RAW_DYNAMIC_LIBS ${QT_DYNAMIC_LIBS} 


# For each item in this list, expand the wildcard to get the actual library list.

foreach(lib ${RAW_DYNAMIC_LIBS})



  string(FIND "${lib}" "*" position)

  if(${position} EQUAL -1)

    # No wildcard, just add it.

isis/cmake/FindCholmod.cmake

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ find_library(COLAMD_LIBRARY NAMES colamd) 
find_library(CAMD_LIBRARY         NAMES camd)

find_library(AMD_LIBRARY          NAMES amd)

find_library(SUITESPARSE_LIBRARY  NAMES suitesparseconfig)



# OSX does not link against lapack

if(NOT APPLE)

  find_library(LAPACK_LIBRARY       NAMES lapack)

isis/cmake/FindGeos.cmake

+14 −26
Original line number Diff line number Diff line
@@ -6,32 +6,20 @@ 
#   GEOS_LIBRARY





if(APPLE)

find_path(GEOS_INCLUDE_DIR

  NAME geos

    PATH_SUFFIXES geos/geos3.5.0/

  HINT geom.h

  PATH_SUFFIXES geos/geos

)

find_library(GEOS_LIBRARY

    NAMES geos-3.5.0

  NAMES geos

)

find_library(GEOS_C_LIBRARY

  NAMES geos_c

)

else()

  #changing to 3.5.1 for v007

  find_path(GEOS_INCLUDE_DIR

    NAME geos

    PATH_SUFFIXES geos/geos3.5.1/

  )

  #tjw:  Changing to 3.5.1 for v007

  find_library(GEOS_LIBRARY

    NAMES geos-3.5.1

  )

  

  find_library(GEOS_C_LIBRARY

    NAMES geos_c

  )



endif(APPLE)

message( "GEOS INCLUDE DIR: "  ${GEOS_INCLUDE_DIR} )

message( "GEOS LIB: "  ${GEOS_LIBRARY} )

message( "GEOS C LIB: "  ${GEOS_C_LIBRARY} )



get_filename_component(GEOS_ROOT_INCLUDE_DIR "${GEOS_INCLUDE_DIR}" DIRECTORY)