summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-x.gitlab/ci/docker/cuda9.2/install_deps.sh6
-rw-r--r--.gitlab/os-linux.yml2
-rw-r--r--Help/guide/tutorial/Adding System Introspection.rst5
-rw-r--r--Help/prop_gbl/CMAKE_CUDA_KNOWN_FEATURES.rst2
-rw-r--r--Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst6
-rw-r--r--Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst14
-rw-r--r--Source/CMakeVersion.cmake2
7 files changed, 33 insertions, 4 deletions
diff --git a/.gitlab/ci/docker/cuda9.2/install_deps.sh b/.gitlab/ci/docker/cuda9.2/install_deps.sh
index 146f982..0dcb507 100755
--- a/.gitlab/ci/docker/cuda9.2/install_deps.sh
+++ b/.gitlab/ci/docker/cuda9.2/install_deps.sh
@@ -4,6 +4,12 @@ set -e
apt-get update
+# Update base packages.
+apt-get install -y \
+ libgnutls30 \
+ libssl1.0.0 \
+ openssl
+
# Install development tools.
apt-get install -y \
g++ \
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 1513c90..948775c 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -209,7 +209,7 @@
### CUDA builds
.cuda9.2:
- image: "kitware/cmake:ci-cuda9.2-x86_64-2021-07-01"
+ image: "kitware/cmake:ci-cuda9.2-x86_64-2021-10-01"
variables:
GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci"
diff --git a/Help/guide/tutorial/Adding System Introspection.rst b/Help/guide/tutorial/Adding System Introspection.rst
index 7210a8d..e149110 100644
--- a/Help/guide/tutorial/Adding System Introspection.rst
+++ b/Help/guide/tutorial/Adding System Introspection.rst
@@ -14,11 +14,14 @@ these functions using the :module:`CheckSymbolExists` module in
the ``m`` library. If ``log`` and ``exp`` are not initially found, require the
``m`` library and try again.
+Add the checks for ``log`` and ``exp`` to ``MathFunctions/CMakeLists.txt``,
+after the call to :command:`target_include_directories`:
+
.. literalinclude:: Step6/MathFunctions/CMakeLists.txt
:caption: MathFunctions/CMakeLists.txt
:name: MathFunctions/CMakeLists.txt-check_symbol_exists
:language: cmake
- :start-after: # does this system provide the log and exp functions?
+ :start-after: # to find MathFunctions.h, while we don't.
:end-before: # add compile definitions
If available, use :command:`target_compile_definitions` to specify
diff --git a/Help/prop_gbl/CMAKE_CUDA_KNOWN_FEATURES.rst b/Help/prop_gbl/CMAKE_CUDA_KNOWN_FEATURES.rst
index 6bbb870..3a17973 100644
--- a/Help/prop_gbl/CMAKE_CUDA_KNOWN_FEATURES.rst
+++ b/Help/prop_gbl/CMAKE_CUDA_KNOWN_FEATURES.rst
@@ -32,4 +32,6 @@ The features known to this version of CMake are:
Compiler mode is at least CUDA/C++ 20.
``cuda_std_23``
+ .. versionadded:: 3.20
+
Compiler mode is at least CUDA/C++ 23.
diff --git a/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst b/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
index 73c0b34..1a913fb 100644
--- a/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
+++ b/Help/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.rst
@@ -18,6 +18,8 @@ The features known to this version of CMake are listed below.
High level meta features indicating C++ standard support
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.. versionadded:: 3.8
+
The following meta features indicate general support for the associated
language standard. It reflects the language support claimed by the compiler,
but it does not necessarily imply complete conformance to that standard.
@@ -35,9 +37,13 @@ but it does not necessarily imply complete conformance to that standard.
Compiler mode is at least C++ 17.
``cxx_std_20``
+ .. versionadded:: 3.12
+
Compiler mode is at least C++ 20.
``cxx_std_23``
+ .. versionadded:: 3.20
+
Compiler mode is at least C++ 23.
Low level individual compile features
diff --git a/Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst b/Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst
index 2bd0feb..97da697 100644
--- a/Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst
+++ b/Help/prop_gbl/CMAKE_C_KNOWN_FEATURES.rst
@@ -13,7 +13,12 @@ The features listed here may be used with the :command:`target_compile_features`
command. See the :manual:`cmake-compile-features(7)` manual for information on
compile features and a list of supported compilers.
-The features known to this version of CMake are:
+The features known to this version of CMake are listed below.
+
+High level meta features indicating C standard support
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. versionadded:: 3.8
``c_std_90``
Compiler mode is at least C 90.
@@ -25,11 +30,18 @@ The features known to this version of CMake are:
Compiler mode is at least C 11.
``c_std_17``
+ .. versionadded:: 3.21
+
Compiler mode is at least C 17.
``c_std_23``
+ .. versionadded:: 3.21
+
Compiler mode is at least C 23.
+Low level individual compile features
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
``c_function_prototypes``
Function prototypes, as defined in ``ISO/IEC 9899:1990``.
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index beb0e97..7a69f8d 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,7 +1,7 @@
# CMake version number components.
set(CMake_VERSION_MAJOR 3)
set(CMake_VERSION_MINOR 21)
-set(CMake_VERSION_PATCH 20210930)
+set(CMake_VERSION_PATCH 20211004)
#set(CMake_VERSION_RC 0)
set(CMake_VERSION_IS_DIRTY 0)