summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
Diffstat (limited to 'Help')
-rw-r--r--Help/command/install.rst3
-rw-r--r--Help/release/3.1.0.rst4
-rw-r--r--Help/release/dev/ExternalProject_UPDATE_DISCONNECTED.rst6
-rw-r--r--Help/variable/CMAKE_INSTALL_PREFIX.rst5
4 files changed, 17 insertions, 1 deletions
diff --git a/Help/command/install.rst b/Help/command/install.rst
index 4c52abf..5dd5aaa 100644
--- a/Help/command/install.rst
+++ b/Help/command/install.rst
@@ -268,7 +268,8 @@ Custom Installation Logic
::
- install([[SCRIPT <file>] [CODE <code>]] [...])
+ install([[SCRIPT <file>] [CODE <code>]]
+ [COMPONENT <component>] [...])
The ``SCRIPT`` form will invoke the given CMake script files during
installation. If the script file name is a relative path it will be
diff --git a/Help/release/3.1.0.rst b/Help/release/3.1.0.rst
index e7a695d..65aae00 100644
--- a/Help/release/3.1.0.rst
+++ b/Help/release/3.1.0.rst
@@ -386,3 +386,7 @@ Other Changes
the Open Watcom external version numbering. The external
version numbers are lower than the internal version number
by 11.
+
+* The ``cmake-mode.el`` major Emacs editing mode no longer
+ treats ``_`` as part of words, making it more consistent
+ with other major modes.
diff --git a/Help/release/dev/ExternalProject_UPDATE_DISCONNECTED.rst b/Help/release/dev/ExternalProject_UPDATE_DISCONNECTED.rst
new file mode 100644
index 0000000..bed4a89
--- /dev/null
+++ b/Help/release/dev/ExternalProject_UPDATE_DISCONNECTED.rst
@@ -0,0 +1,6 @@
+ExternalProject_UPDATE_DISCONNECTED
+-----------------------------------
+
+* The :module:`ExternalProject` module ``ExternalProject_Add`` command
+ learned an ``UPDATE_DISCONNECTED`` option to avoid automatically
+ updating the source tree checkout from version control.
diff --git a/Help/variable/CMAKE_INSTALL_PREFIX.rst b/Help/variable/CMAKE_INSTALL_PREFIX.rst
index 72c8d41..ee9b615 100644
--- a/Help/variable/CMAKE_INSTALL_PREFIX.rst
+++ b/Help/variable/CMAKE_INSTALL_PREFIX.rst
@@ -27,3 +27,8 @@ which cannot be prepended with some other prefix.
The installation prefix is also added to CMAKE_SYSTEM_PREFIX_PATH so
that find_package, find_program, find_library, find_path, and
find_file will search the prefix for other software.
+
+.. note::
+
+ Use the :module:`GNUInstallDirs` module to provide GNU-style
+ options for the layout of directories within the installation.