diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-18 13:37:18 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-18 13:37:26 (GMT) |
| commit | 0dba1db9d5d9f2c555c718acde5ec550503fae6f (patch) | |
| tree | fb4a7621c4f811c124ffdce1bb5148f9c7d354ee /Help | |
| parent | 0f23697eb0625c7c0eedbe46bbb98f62b6cd89c6 (diff) | |
| parent | 1e56634faa44c9a26b0e7a4f529396d761f8833d (diff) | |
| download | CMake-0dba1db9d5d9f2c555c718acde5ec550503fae6f.zip CMake-0dba1db9d5d9f2c555c718acde5ec550503fae6f.tar.gz CMake-0dba1db9d5d9f2c555c718acde5ec550503fae6f.tar.bz2 | |
Merge topic 'module-fetchcontent'
1e56634f FetchContent: Add tests
60e74d2f FetchContent: New module for populating content at configure time
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1306
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-modules.7.rst | 1 | ||||
| -rw-r--r-- | Help/module/FetchContent.rst | 1 | ||||
| -rw-r--r-- | Help/release/dev/FetchContent.rst | 11 |
3 files changed, 13 insertions, 0 deletions
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst index 8f4b252..9fd92ec 100644 --- a/Help/manual/cmake-modules.7.rst +++ b/Help/manual/cmake-modules.7.rst @@ -80,6 +80,7 @@ All Modules /module/ExternalData /module/ExternalProject /module/FeatureSummary + /module/FetchContent /module/FindALSA /module/FindArmadillo /module/FindASPELL diff --git a/Help/module/FetchContent.rst b/Help/module/FetchContent.rst new file mode 100644 index 0000000..c130a6d --- /dev/null +++ b/Help/module/FetchContent.rst @@ -0,0 +1 @@ +.. cmake-module:: ../../Modules/FetchContent.cmake diff --git a/Help/release/dev/FetchContent.rst b/Help/release/dev/FetchContent.rst new file mode 100644 index 0000000..3b12977 --- /dev/null +++ b/Help/release/dev/FetchContent.rst @@ -0,0 +1,11 @@ +FetchContent +------------ + +* A new :module:`FetchContent` module was added which supports populating + content at configure time using any of the download/update methods + supported by :command:`ExternalProject_Add`. This allows the content + to be used immediately during the configure stage, such as with + :command:`add_subdirectory`, etc. Hierarchical project structures are + well supported, allowing parent projects to override the content details + of child projects and ensuring content is not populated multiple times + throughout the whole project tree. |