Commit 355ac2aa authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

removed from source files

parent d614f52f

isis/CMakeLists.txt

+17 −20
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ message("Detected Operating System: ${osVersionString}") 
#  as a static library using some specialized code in Utilities.cmake.

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)
@@ -106,7 +105,7 @@ 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 )



if(EXISTS ${isis3Data})

  set(ENV{ISIS3DATA} "${isis3Data}")
@@ -157,19 +156,17 @@ include(FindAllDependencies) 
include_directories(SYSTEM ${ALLINCDIRS})

link_directories(${ALLLIBDIRS})



# add isis headers



# inject ISISROOT

add_definitions( -DISISROOT="${CMAKE_SOURCE_DIR}" )

add_definitions( -DISISBUILDDIR="${CMAKE_BINARY_DIR}" )



# add isis headers

file(GLOB ISIS_HEADERS ${CMAKE_SOURCE_DIR}/src/*/objs/*/*.h

${CMAKE_SOURCE_DIR}/src/*/objs/*/*.hpp)

file(COPY ${ISIS_HEADERS} DESTINATION ${CMAKE_BINARY_DIR}/inc)



include_directories(${CMAKE_BINARY_DIR}/inc)



# install scripts

# file(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/scripts)

# file(COPY ${CMAKE_SOURCE_DIR}/scripts DESTINATION ${CMAKE_INSTALL_PREFIX})



set(CORE_LIB_NAME isis3)



# Specify relative library include paths which will be set up on
@@ -225,18 +222,18 @@ 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()



# # 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()



# Set up documentation build target.

# - This script is called by running "make docs".

isis/cmake/FindAllDependencies.cmake

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ if(APPLE) 
  set(PLUGIN_DIR "${thirdPartyDir}/ports/libexec/qt5/plugins")

endif(APPLE)



set(JP2KFLAG 1)



# Add thirdPartyCppFlags

set(thirdPartyCppFlags ${thirdPartyCppFlags} -DGMM_USES_SUPERLU)
@@ -148,6 +147,7 @@ find_package(Jama REQUIRED) 


# Only include Kakadu if it is available

if(${JP2KFLAG})

  message("ENABLING KAKADU")

  find_package(Kakadu)

endif(${JP2KFLAG})

isis/cmake/FindSuperLU.cmake

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ find_path(SUPERLU_INCLUDE_DIR 
)



find_library(SUPERLU_LIBRARY

  NAMES superlu_4.3

  NAMES superlu_4.3 superlu 

)



get_filename_component(SUPERLU_ROOT_INCLUDE_DIR "${SUPERLU_INCLUDE_DIR}" DIRECTORY)

isis/cmake/RunUnitTest.cmake

+4 −2
Original line number Diff line number Diff line
@@ -53,16 +53,18 @@ if(EXISTS ${exclusionPath}) 
  set(comp1 ${tempDir}/output_exclude.txt)

  set(comp2 ${tempDir}/truth_exclude.txt)

  # This throws out all lines containing a word from the exclusion file.

  execute_process(COMMAND "cat ${outputFile} | grep -v -f ${exclusionPath}"

  execute_process(COMMAND cat ${outputFile} COMMAND grep -v -f ${exclusionPath}

                  OUTPUT_FILE "${comp1}")

  execute_process(COMMAND "cat ${TRUTH_FILE} | grep -v -f ${exclusionPath}"

  execute_process(COMMAND cat ${TRUTH_FILE} COMMAND grep -v -f ${exclusionPath}

                  OUTPUT_FILE "${comp2}")



endif()



# Verify that the files are exactly the same

execute_process(COMMAND ${CMAKE_COMMAND} -E compare_files

    ${comp1} ${comp2}

    RESULT_VARIABLE DIFFERENT)



if(DIFFERENT)

    message(FATAL_ERROR "Test failed - files differ")

    # On error the result file is left around to aid in debugging.

isis/src/base/apps/autoregtemplate/autoregtemplate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ void IsisMain() { 
  // Get user interface

  UserInterface &ui = Application::GetUserInterface();



  Pvl algos("$ISISROOT/lib/AutoReg.plugin");

  Pvl algos(QString(ISISROOT) + "/lib/AutoReg.plugin");

  Pvl p;



  // Begin creating the mapping group