Skip to content

Commit

Permalink
Merge pull request #5167 from kyungjoo-kim/ifpack2-develop
Browse files Browse the repository at this point in the history
Ifpack2 develop
  • Loading branch information
kyungjoo-kim authored May 14, 2019
2 parents 085e9d8 + f99a925 commit b3a8dc8
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 48 deletions.
6 changes: 6 additions & 0 deletions packages/ifpack2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@ TRIBITS_ADD_OPTION_AND_DEFINE(
"Turn on timers in Ifpack2::BlockTriDiContainer."
NO )

TRIBITS_ADD_OPTION_AND_DEFINE(
${PACKAGE_NAME}_ENABLE_BlockTriDiContainer_Small_Scalar
HAVE_IFPACK2_BLOCKTRIDICONTAINER_SMALL_SCALAR
"Enable small scalar in Ifpack2::BlockTriDiContainer."
OFF )

#
# C) Add the libraries, tests, and examples
#
Expand Down
2 changes: 2 additions & 0 deletions packages/ifpack2/cmake/Ifpack2_config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
/* Enable timers in BlockTriDiContainer. */
#cmakedefine HAVE_IFPACK2_BLOCKTRIDICONTAINER_TIMERS

#cmakedefine HAVE_IFPACK2_BLOCKTRIDICONTAINER_SMALL_SCALAR

/*
* Package dependencies
*/
Expand Down
Loading

0 comments on commit b3a8dc8

Please sign in to comment.