Skip to content

Commit

Permalink
Merge Pull Request #5782 from trilinos/Trilinos/master_merge_20190823…
Browse files Browse the repository at this point in the history
…_000620

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20190823_000620 branch to master
PR Author: trilinos-autotester
  • Loading branch information
trilinos-autotester committed Aug 23, 2019
2 parents 034d7f0 + 449fddc commit a0ba716
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 67 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ SET(CTEST_TEST_TIMEOUT 14400) # twice the default value, for valgrind
SET(CTEST_MEMORYCHECK_COMMAND /usr/local/bin/valgrind)
SET(CTEST_DO_MEMORY_TESTING TRUE)

SET(Trilinos_PACKAGES MueLu Xpetra Amesos2)
SET(Trilinos_PACKAGES MueLu Xpetra ML)

SET(EXTRA_CONFIGURE_OPTIONS
"-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION=ON"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ SET(CTEST_TEST_TIMEOUT 14400) # twice the default value, for valgrind
SET(CTEST_MEMORYCHECK_COMMAND /usr/local/bin/valgrind)
SET(CTEST_DO_MEMORY_TESTING TRUE)

SET(Trilinos_PACKAGES MueLu Xpetra Amesos2)
SET(Trilinos_PACKAGES MueLu Xpetra ML)

SET(EXTRA_CONFIGURE_OPTIONS
"-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION=ON"
Expand Down
Loading

0 comments on commit a0ba716

Please sign in to comment.