summaryrefslogtreecommitdiff
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-03-19 12:53:24 +0000
committerKitware Robot <kwrobot@kitware.com>2019-03-19 08:53:35 -0400
commit146b95949194ccf9aff3cfbe2243bde9727e16d5 (patch)
treea59867fc19ad68bd97892feb2babc35f7da93751 /Help
parenta9a4f3b1936c8e9b659b7b59166d1e73dc6d2397 (diff)
parentdfea916d3c1e09d7a008a27029540b5ec77adb5d (diff)
downloadcmake-146b95949194ccf9aff3cfbe2243bde9727e16d5.tar.gz
Merge topic 'environment-modules'
dfea916d3c FindEnvModules: Provide a CMake interface to environment modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3076
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-modules.7.rst1
-rw-r--r--Help/module/FindEnvModules.rst1
-rw-r--r--Help/release/dev/environment-modules.rst5
3 files changed, 7 insertions, 0 deletions
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index d9b939f3bf..fc4bfdc7ab 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -125,6 +125,7 @@ They are normally called through the :command:`find_package` command.
/module/FindDCMTK
/module/FindDevIL
/module/FindDoxygen
+ /module/FindEnvModules
/module/FindEXPAT
/module/FindFLEX
/module/FindFLTK2
diff --git a/Help/module/FindEnvModules.rst b/Help/module/FindEnvModules.rst
new file mode 100644
index 0000000000..72c120f221
--- /dev/null
+++ b/Help/module/FindEnvModules.rst
@@ -0,0 +1 @@
+.. cmake-module:: ../../Modules/FindEnvModules.cmake
diff --git a/Help/release/dev/environment-modules.rst b/Help/release/dev/environment-modules.rst
new file mode 100644
index 0000000000..eace35d751
--- /dev/null
+++ b/Help/release/dev/environment-modules.rst
@@ -0,0 +1,5 @@
+environment-modules
+-------------------
+
+* The :module:`FindEnvModules` module was added to use Lua- and TCL-based
+ environment modules in :ref:`CTest Scripts <CTest Script>`.