Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Piro: Fix Piro when Teko and Tpetra are not explicitly enabled. #12802

Merged
merged 2 commits into from
Mar 8, 2024
Merged

Piro: Fix Piro when Teko and Tpetra are not explicitly enabled. #12802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a5c1a8
Make Teko and Tpetra required dependencies of Piro
sebrowne Mar 7, 2024
302440b
Stop asserting another package's internal variable
sebrowne Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/piro/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ GLOBAL_SET(HAVE_PIRO_TEKO ${${PACKAGE_NAME}_ENABLE_Teko})
ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Stratimikos)
GLOBAL_SET(HAVE_PIRO_STRATIMIKOS ${${PACKAGE_NAME}_ENABLE_Stratimikos})

ASSERT_DEFINED(NOX_ENABLE_Epetra)
IF (${PACKAGE_NAME}_ENABLE_Epetra AND NOT NOX_ENABLE_Epetra)
IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PROJECT_NAME}_ENABLE_NOX AND NOT NOX_ENABLE_Epetra)
MESSAGE(FATAL_ERROR "Piro configuration error: Enabling Epetra in Piro also requires that Epetra be enabled in NOX (-DNOX_ENABLE_Epetra:BOOL=ON)")
ENDIF()

Expand Down
7 changes: 3 additions & 4 deletions packages/piro/cmake/Dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Can make Epetra & EpetraExt Optional in the future
SET(LIB_REQUIRED_DEP_PACKAGES Teuchos Stratimikos ThyraCore)
SET(LIB_REQUIRED_DEP_PACKAGES Teuchos Stratimikos ThyraCore Tpetra Teko)
SET(LIB_OPTIONAL_DEP_PACKAGES NOX Tempus Stokhos
ROL Ifpack2 MueLu ThyraEpetraAdapters ThyraEpetraExtAdapters Epetra EpetraExt Tpetra Teko)
SET(TEST_REQUIRED_DEP_PACKAGES)
ROL Ifpack2 MueLu ThyraEpetraAdapters ThyraEpetraExtAdapters Epetra EpetraExt)
SET(TEST_REQUIRED_DEP_PACKAGES ThyraTpetraAdapters MPI)
SET(TEST_OPTIONAL_DEP_PACKAGES)
SET(LIB_REQUIRED_DEP_TPLS )
SET(LIB_OPTIONAL_DEP_TPLS)
Expand Down
Loading