Skip to content

Commit

Permalink
Merge Pull Request trilinos#10932 from trilinos/Trilinos/csiefer-4c901f5
Browse files Browse the repository at this point in the history
Automatically Merged using Trilinos Pull Request AutoTester
PR Title: Tpetra: configure option to disable Kokkos integration test
PR Author: csiefer2
  • Loading branch information
trilinos-autotester committed Aug 26, 2022
2 parents 8e1ffec + 4c901f5 commit 18e7b2c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
10 changes: 10 additions & 0 deletions packages/tpetra/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,16 @@ TRIBITS_ADD_OPTION_AND_DEFINE(
OFF
)

TRIBITS_ADD_OPTION_AND_DEFINE(
Tpetra_ENABLE_KokkosIntegrationTest
HAVE_TPETRA_KOKKOSINTEGRATION_TEST
"Enable the KokkosIntegrationTest"
ON
)




#
# Add libraries, tests, and examples
#
Expand Down
4 changes: 3 additions & 1 deletion packages/tpetra/core/test/KokkosIntegration/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@

ASSERT_DEFINED (Tpetra_ENABLE_CUDA)

IF (Tpetra_ENABLE_CUDA AND BUILD_SHARED_LIBS)
ASSERT_DEFINED (Tpetra_ENABLE_KokkosIntegrationTest)

IF (Tpetra_ENABLE_CUDA AND BUILD_SHARED_LIBS AND Tpetra_ENABLE_KokkosIntegrationTest)
MESSAGE(STATUS "Tpetra: Enabling KokkosIntegration Tests")

TRIBITS_ADD_LIBRARY(
Expand Down

0 comments on commit 18e7b2c

Please sign in to comment.