Skip to content

Commit

Permalink
Merge pull request #12095 from cabejackson/trilinos-release-14-4-branch
Browse files Browse the repository at this point in the history
Trilinos release 14.4
  • Loading branch information
cabejackson authored Aug 1, 2023
2 parents 31b9896 + 66ca326 commit 9753074
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions PackagesList.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(Komplex) # 27030 targets
TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(Moertel) # 26995 targets
TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(TriKota) # 26995 targets
TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(Domi) # 26946 targets
TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(FEI)

#
# Disable certain packages on certain platforms.
Expand Down
10 changes: 5 additions & 5 deletions Version.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@
# for release mode and set the version.
#

SET(Trilinos_VERSION 14.3)
SET(Trilinos_VERSION 14.4)
SET(Trilinos_MAJOR_VERSION 14)
SET(Trilinos_MAJOR_MINOR_VERSION 140300)
SET(Trilinos_VERSION_STRING "14.3 (Dev)")
SET(Trilinos_ENABLE_DEVELOPMENT_MODE_DEFAULT ON) # Change to 'OFF' for a release
SET(Trilinos_MAJOR_MINOR_VERSION 140400)
SET(Trilinos_VERSION_STRING "14.4")
SET(Trilinos_ENABLE_DEVELOPMENT_MODE_DEFAULT OFF) # Change to 'OFF' for a release

# Used by testing scripts and should not be used elsewhere
SET(Trilinos_REPOSITORY_BRANCH "develop" CACHE INTERNAL "")
SET(Trilinos_REPOSITORY_BRANCH "trilinos-release-14-4-branch" CACHE INTERNAL "")
SET(Trilinos_EXTRAREPOS_BRANCH "master" CACHE INTERNAL "")
SET(Trilinos_TESTING_TRACK "" CACHE INTERNAL "")

Expand Down

0 comments on commit 9753074

Please sign in to comment.