Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: DARMA-tasking/magistrate
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a81d7e7ac7a56226683dde1865ffc77b9280a785
Choose a base ref
..
head repository: DARMA-tasking/magistrate
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 12aa10e4b1bed94ee5657d4fe7d4c24f255f6245
Choose a head ref
Showing with 17 additions and 17 deletions.
  1. +0 −17 CMakeLists.txt
  2. +17 −0 tests/CMakeLists.txt
17 changes: 0 additions & 17 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -151,23 +151,6 @@ if (magistrate_tests_enabled
# Testing is only enabled if the actual project being built is magistrate.
include(CTest)

find_package(GTest)
if (NOT GTest_FOUND)
include(FetchContent)
FetchContent_Declare(
googletest
DOWNLOAD_EXTRACT_TIMESTAMP FALSE
URL https://github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz
)
FetchContent_MakeAvailable(googletest)
endif()

message(
STATUS
"Magistrate: GTest package is found, unit tests are enabled "
"GTEST_ROOT=${GTEST_ROOT}"
)

add_custom_target(magistrate_tests)
add_subdirectory(tests)
endif()
17 changes: 17 additions & 0 deletions tests/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,23 @@
set(PROJECT_TEST_UNIT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/unit)
set(PROJECT_TEST_MPI_UNIT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/unit/tests_mpi)

find_package(GTest)
if (NOT GTest_FOUND)
include(FetchContent)
FetchContent_Declare(
googletest
DOWNLOAD_EXTRACT_TIMESTAMP FALSE
URL https://github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz
)
FetchContent_MakeAvailable(googletest)
endif()

message(
STATUS
"Magistrate: GTest package is found, unit tests are enabled "
"GTEST_ROOT=${GTEST_ROOT}"
)

if(magistrate_mpi_enabled)
message(STATUS "Building unit tests with MPI")
file(