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

All: Do not auto-enable deprecated packages #12869

Merged
merged 2 commits into from
Apr 18, 2024
Merged

All: Do not auto-enable deprecated packages #12869

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e783f5a
Move all deprecated packages to secondary tested
sebrowne Mar 28, 2024
90abfbc
Add release note about enable behavior change
sebrowne Apr 18, 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
18 changes: 9 additions & 9 deletions PackagesList.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ TRIBITS_REPOSITORY_DEFINE_PACKAGES(
RTOp packages/rtop PT
Sacado packages/sacado PT
MiniTensor packages/minitensor PT
Epetra packages/epetra PT
Epetra packages/epetra ST
SCOREClion SCOREC/lion ST
SCORECpcu SCOREC/pcu ST
SCORECgmi SCOREC/gmi ST
Expand All @@ -80,22 +80,22 @@ TRIBITS_REPOSITORY_DEFINE_PACKAGES(
AvatarT packages/avatart EX
Zoltan packages/zoltan PT
Shards packages/shards PT
Triutils packages/triutils PT
EpetraExt packages/epetraext PT
Triutils packages/triutils ST
EpetraExt packages/epetraext ST
Tpetra packages/tpetra PT
TrilinosSS packages/common/auxiliarySoftware/SuiteSparse PT # Auxiliary software.
Domi packages/domi PT
Thyra packages/thyra PT
Xpetra packages/xpetra PT
Isorropia packages/isorropia PT
Isorropia packages/isorropia ST
Pliris packages/pliris ST
AztecOO packages/aztecoo PT
AztecOO packages/aztecoo ST
Galeri packages/galeri PT
Amesos packages/amesos PT
Amesos packages/amesos ST
Pamgen packages/pamgen PT
Zoltan2Core packages/zoltan2/core PT
Ifpack packages/ifpack PT
ML packages/ml PT
Ifpack packages/ifpack ST
ML packages/ml ST
Belos packages/belos PT
ShyLU_Node packages/shylu/shylu_node PT
Amesos2 packages/amesos2 PT
Expand All @@ -107,7 +107,7 @@ TRIBITS_REPOSITORY_DEFINE_PACKAGES(
FEI packages/fei PT
Teko packages/teko PT
TriKota packages/TriKota ST
Intrepid packages/intrepid PT
Intrepid packages/intrepid ST
Intrepid2 packages/intrepid2 PT
Compadre packages/compadre ST
STK packages/stk PT # Depends on boost
Expand Down
2 changes: 1 addition & 1 deletion ProjectName.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SET(PROJECT_NAME Trilinos)

SET(${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE_DEFAULT ON)
SET(${PROJECT_NAME}_ENABLE_SECONDARY_TESTED_CODE_DEFAULT OFF)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a break in backward compatibility. This will break many users configure scripts.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. This is the most dangerous part of this change (and is what the large text in the description is intended to convey).


SET(${PROJECT_NAME}_GENERATE_REPO_VERSION_FILE_DEFAULT ON)

Expand Down
2 changes: 1 addition & 1 deletion packages/shylu/shylu_dd/cmake/Dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SET(SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS
# New ShyLU subpackages:
FROSch frosch PT REQUIRED
#Core core EX OPTIONAL
Core core PT REQUIRED
Core core ST REQUIRED
Common common ST OPTIONAL
)

Expand Down
4 changes: 2 additions & 2 deletions packages/thyra/cmake/Dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS
Core core PT REQUIRED
EpetraAdapters adapters/epetra PT OPTIONAL
EpetraExtAdapters adapters/epetraext PT OPTIONAL
EpetraAdapters adapters/epetra ST OPTIONAL
EpetraExtAdapters adapters/epetraext ST OPTIONAL
TpetraAdapters adapters/tpetra PT OPTIONAL
)