Merge Pull Request #7735 from ZUUL42/Trilinos/update_ver_num_13

Automatically Merged using Trilinos Pull Request AutoTester rel 13.00 PR Title: Update version for release 13.0.0 PR Author: ZUUL42
trilinos · Aug 6, 2020 · 9fec352 · 9fec352
2 parents 7b530ed + 2f5f874
commit 9fec352
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Version.cmake b/Version.cmake
@@ -59,14 +59,14 @@
 # for release mode and set the version.
 #
 
-SET(Trilinos_VERSION 12.17)
-SET(Trilinos_MAJOR_VERSION 12)
-SET(Trilinos_MAJOR_MINOR_VERSION 121700)
-SET(Trilinos_VERSION_STRING "12.17 (Dev)")
-SET(Trilinos_ENABLE_DEVELOPMENT_MODE_DEFAULT ON) # Change to 'OFF' for a release
+SET(Trilinos_VERSION 13.0)
+SET(Trilinos_MAJOR_VERSION 13)
+SET(Trilinos_MAJOR_MINOR_VERSION 130000)
+SET(Trilinos_VERSION_STRING "13.0")
+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-13-0-branch" CACHE INTERNAL "")
 SET(Trilinos_EXTRAREPOS_BRANCH "master" CACHE INTERNAL "")
 SET(Trilinos_TESTING_TRACK "" CACHE INTERNAL "")
 

diff --git a/cmake/std/PullRequestLinuxCuda9.2TestingSettings.cmake b/cmake/std/PullRequestLinuxCuda9.2TestingSettings.cmake
@@ -122,3 +122,5 @@ set (KokkosCore_UnitTest_Cuda_MPI_1_EXTRA_ARGS
   CACHE STRING "Temporary disable for CUDA PR testing")
 
 include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxCommonTestingSettings.cmake")
+
+set (Zoltan_ch_simple_zoltan_parallel_DISABLE ON CACHE BOOL "Disabled for Release 13.0")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -122,3 +122,5 @@ set (KokkosCore_UnitTest_Cuda_MPI_1_EXTRA_ARGS
		CACHE STRING "Temporary disable for CUDA PR testing")

		include("${CMAKE_CURRENT_LIST_DIR}/PullRequestLinuxCommonTestingSettings.cmake")

		set (Zoltan_ch_simple_zoltan_parallel_DISABLE ON CACHE BOOL "Disabled for Release 13.0")