Unverified Commit b6ad70b4 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by GitHub
Browse files

fixed building errors (#3707)

parent 2b86e8b3

isis/src/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -15,3 +15,4 @@ foreach( mod ${modules} ) 
  string(REPLACE "${CMAKE_CURRENT_LIST_DIR}/" "" strippedmod ${mod})

  add_isis_module(${strippedmod} ${strippedmod})

endforeach()

isis/tests/CMakeLists.txt

+31 −1
Original line number Diff line number Diff line
@@ -8,11 +8,41 @@ file(GLOB test_source "${CMAKE_SOURCE_DIR}/tests/*.cpp") 
file(GLOB isis_libs "${CMAKE_BINARY_DIR}/lib/*.so")

file(GLOB isis_mac_libs "${CMAKE_BINARY_DIR}/lib/*.dylib")



set(MISSION_LIBS

  apollo

  cassini

  chandrayaan1

  clementine

  clipper

  dawn

  galileo

  hayabusa

  hayabusa2

  juno

  kaguya

  lo

  lro

  mariner

  mer

  messenger

  mex

  mgs

  mro

  near

  newhorizons

  odyssey

  osirisrex

  rosetta

  tgo

  viking

  voyager)





# Link runISISTests with what we want to test and the GTest and pthread library

add_executable(runISISTests

               IsisTestMain.cpp

               ${test_source})



target_link_libraries(runISISTests isis3 ${isis_libs} ${isis_mac_libs} ${ALLLIBS} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} Threads::Threads)

target_link_libraries(runISISTests isis3 ${MISSION_LIBS} ${ALLLIBS} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} Threads::Threads)



gtest_discover_tests(runISISTests WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)

isis/tests/FunctionalTestsLeisa2isis.cpp

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ TEST(leisa2isisTest, leisa2isisTestDefault) { 


  // BandBin Group

  // Check size, first, 2 middle, and last values? Enough?

  PvlGroup &bandbin = isisLabel->findGroup("BandBin", Pvl::Traverse);

  ASSERT_EQ(bandbin["Center"].size(), 256);

  ASSERT_EQ(bandbin["Width"].size(), 256);

  ASSERT_EQ(bandbin["OriginalBand"].size(), 256);