Merge pull request #150 from LLNL/release/2.2.1

Release v2.2.1
LLNL · Sep 2, 2020 · c912f58 · c912f58
2 parents 18536c6 + e8d8074
commit c912f58
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@
 cmake_policy(SET CMP0057 NEW)
 cmake_policy(SET CMP0048 NEW)
 
-project(Chai LANGUAGES CXX VERSION 2.2.0)
+project(Chai LANGUAGES CXX VERSION 2.2.1)
 
 set(ENABLE_CUDA Off CACHE BOOL "Enable CUDA")
 set(ENABLE_HIP Off CACHE BOOL "Enable HIP")

diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
@@ -63,7 +63,7 @@
 # The short X.Y version.
 version = u'2.2'
 # The full version, including alpha/beta/rc tags.
-release = u'2.2.0'
+release = u'2.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/sphinx/conf.py.in b/docs/sphinx/conf.py.in
@@ -62,7 +62,7 @@ author = u''
 # The short X.Y version.
 version = u'2.2'
 # The full version, including alpha/beta/rc tags.
-release = u'2.2.0'
+release = u'2.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/scripts/make_release_tarball.sh b/scripts/make_release_tarball.sh
@@ -7,7 +7,7 @@
 ##############################################################################
 
 TAR_CMD=gtar
-VERSION=2.2.0
+VERSION=2.2.1
 
 git archive --prefix=chai-${VERSION}/ -o chai-${VERSION}.tar HEAD 2> /dev/null
 

diff --git a/src/chai/CMakeLists.txt b/src/chai/CMakeLists.txt
@@ -66,6 +66,12 @@ if (ENABLE_RAJA_PLUGIN)
   set (chai_depends
     ${chai_depends}
     RAJA)
+
+  if (ENABLE_CUDA)
+    set (chai_depends
+      ${chai_depends}
+      cuda)
+  endif ()
 endif ()
 
 blt_add_library(