Commit 5bd8c919 authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

Tweaking things for gtest

parent 7d55f34d

isis/CMakeLists.txt

+13 −4
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ include(AddIsisModule) 
include(Utilities)

include(TestSetup)

include(InstallThirdParty)

include(cmake/gtest.cmake)

include(GoogleTest)



#===============================================================================

#===============================================================================
@@ -28,15 +30,15 @@ set(PACKAGE "ISIS") 
set(PACKAGE_NAME       "USGS ISIS")



# Version number

set(VERSION            "3.5.00.0")

set(VERSION            "3.6.00.0")

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(VERSION_DATE              "2018-11-09")

set(THIRD_PARTY_LIBS_VERSION  "v008")

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



# Define to the address where bug reports for this package should be sent.
@@ -245,6 +247,7 @@ find_package(PNG REQUIRED) 
find_package(Kakadu)

find_package(Geos    3.5.0     REQUIRED)

find_package(Armadillo         REQUIRED)

find_package(Threads)



if(pybindings)

 find_package(Python REQUIRED)
@@ -344,7 +347,7 @@ if(pybindings) 


 file(GLOB SIP_GENERATED_SOURCE_FILES ${ISIS_SIP_CODE_DIR}/*.cpp)

 add_library(isispy MODULE ${SIP_GENERATED_SOURCE_FILES})

 target_link_libraries(isispy ${ALLLIBS})

 target_link_libraries(isispy ${ALLLIBS} gtest ${CMAKE_THREAD_LIBS_INIT})

 target_link_libraries(isispy isis3)

 set_target_properties(isispy PROPERTIES LINK_DEPENDS isis3 INSTALL_RPATH ${CMAKE_INSTALL_PREFIX})

 add_dependencies(isispy sipfiles)
@@ -459,3 +462,9 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/scripts DESTINATION ${CMAKE_INSTA 
#   the end of this file containing a CMakeLists.txt file which includes all of

#   the desired post-install commands inside.

add_subdirectory(cmake)

option (BUILD_TESTS "Build tests" ON)

if(BUILD_TESTS)

  include(CTest)

  enable_testing()

  add_subdirectory(tests)

endif()

isis/cmake/gtest.cmake

+5 −5
Original line number Diff line number Diff line 
if (NOT TARGET gtest)

  set(GOOGLETEST_ROOT gtest/googletest CACHE STRING "Google Test source root")

  set(GOOGLETEST_ROOT ${CMAKE_SOURCE_DIR}/../gtest/googletest CACHE STRING "Google Test source root")



  include_directories(SYSTEM

      ${PROJECT_SOURCE_DIR}/${GOOGLETEST_ROOT}

      ${PROJECT_SOURCE_DIR}/${GOOGLETEST_ROOT}/include

      ${GOOGLETEST_ROOT}

      ${GOOGLETEST_ROOT}/include

      )



  set(GOOGLETEST_SOURCES

      ${PROJECT_SOURCE_DIR}/${GOOGLETEST_ROOT}/src/gtest-all.cc

      ${PROJECT_SOURCE_DIR}/${GOOGLETEST_ROOT}/src/gtest_main.cc

      ${GOOGLETEST_ROOT}/src/gtest-all.cc

      ${GOOGLETEST_ROOT}/src/gtest_main.cc

      )



  foreach(_source ${GOOGLETEST_SOURCES})