Merge branch 'origin/release-2020' into master

[alexxy/gromacs.git] / admin / containers / utility.py

diff --git a/admin/containers/utility.py b/admin/containers/utility.py
index e413a19be0c7f1fb661ddf9cd54f33dfd8b62e7b..6652b8edfde5e0de142b255af6af00c9985cf926 100644 (file)
--- a/admin/containers/utility.py
+++ b/admin/containers/utility.py
@@ -58,8 +58,8 @@ parsers for tools.
 """
 
 # TODO: Try using distutils.version.StrictVersion.
-parser.add_argument('--cmake', type=str, default='3.9.6',
-                    choices=['3.9.6', '3.11.4', '3.15.7'],
+parser.add_argument('--cmake', type=str, default='3.13.0',
+                    choices=['3.9.6', '3.11.4', '3.13.0', '3.14.7', '3.15.7', '3.16.6', '3.17.2'],
                     help='Selection of CMake version to provide to base image')
 compiler_group = parser.add_mutually_exclusive_group()
 compiler_group.add_argument('--gcc', type=int, nargs='?', const=7, default=7,
@@ -71,7 +71,7 @@ compiler_group.add_argument('--llvm', type=str, nargs='?', const='7', default=No
                             help='Select LLVM compiler tool chain. '
                                  'Some checking is implemented to avoid incompatible combinations')
 compiler_group.add_argument('--icc', type=int, nargs='?', const=19, default=None,
-                            choices=[19],
+                            choices=[19, 20],
                             help='Select Intel compiler tool chain. '
                                  'Some checking is implemented to avoid incompatible combinations')