Merge pull request #527 from makaylas/testing (32fe49a4) · Commits · aflab / astrogeology / ISIS3

.gitmodules

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		[submodule "gtest"]
		path = gtest
		url = git@github.com:google/googletest.git

environment.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ dependencies:
		- bullet==2.86.1=0
		- bz2file==0.98
		- bzip2==1.0.6=1
		- cmake==3.9.1=0
		- cmake>=3.10
		- cspice==66=h470a237_3
		- curl==7.60.0=0
		- doxygen==1.8.14=0

environment_gcc4.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ dependencies:
		- bullet==2.86.1=0
		- bz2file==0.98
		- bzip2==1.0.6=1
		- cmake==3.9.1=0
		- cmake>=3.10
		- cspice==66=h470a237_3
		- curl==7.60.0=0
		- doxygen==1.8.14=0

gtest @ 529c2c6f

Original line number	Diff line number	Diff line
		Subproject commit 529c2c6f4af29dadb8ee5cddf6a7919caa5ca5f6

isis/CMakeLists.txt

+13 −4

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@

		# Specify the required version of CMake. If your machine does not
		# have this, it should be easy to build from https://cmake.org/download/
		cmake_minimum_required(VERSION 3.4)
		cmake_minimum_required(VERSION 3.10)

		# Point cmake to our other CMake files.
		list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
		@@ -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)
		@@ -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()