diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-15 18:25:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-15 18:26:02 (GMT) |
| commit | da566d4de885130e182edc80f13691f5ca24bb61 (patch) | |
| tree | d16c9d04118115b387758ebcfbcf11a6d0c5822f /Modules | |
| parent | 41b0c0dc739c34550b8e9054b9a88405afb6518d (diff) | |
| parent | 2119c33b7e7b5fc348c0b4b24e402bcacb18d5db (diff) | |
| download | CMake-da566d4de885130e182edc80f13691f5ca24bb61.zip CMake-da566d4de885130e182edc80f13691f5ca24bb61.tar.gz CMake-da566d4de885130e182edc80f13691f5ca24bb61.tar.bz2 | |
Merge topic 'fetchcontent-uses-terminal'
2119c33b7e FetchContent: Give access to the terminal for download and update
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.co>
Merge-request: !2800
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FetchContent.cmake | 7 | ||||
| -rw-r--r-- | Modules/FetchContent/CMakeLists.cmake.in | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Modules/FetchContent.cmake b/Modules/FetchContent.cmake index 98cdf6c..c65ae9e 100644 --- a/Modules/FetchContent.cmake +++ b/Modules/FetchContent.cmake @@ -691,6 +691,13 @@ function(__FetchContent_directPopulate contentName) BUILD_COMMAND INSTALL_COMMAND TEST_COMMAND + # We force both of these to be ON since we are always executing serially + # and we want all steps to have access to the terminal in case they + # need input from the command line (e.g. ask for a private key password) + # or they want to provide timely progress. We silently absorb and + # discard these if they are set by the caller. + USES_TERMINAL_DOWNLOAD + USES_TERMINAL_UPDATE ) set(multiValueArgs "") diff --git a/Modules/FetchContent/CMakeLists.cmake.in b/Modules/FetchContent/CMakeLists.cmake.in index 9a7a771..0095b11 100644 --- a/Modules/FetchContent/CMakeLists.cmake.in +++ b/Modules/FetchContent/CMakeLists.cmake.in @@ -18,4 +18,6 @@ ExternalProject_Add(${contentName}-populate BUILD_COMMAND "" INSTALL_COMMAND "" TEST_COMMAND "" + USES_TERMINAL_DOWNLOAD YES + USES_TERMINAL_UPDATE YES ) |