Imported Upstream version 3.11.4upstream/3.11.4

1 files changed, 4 insertions, 4 deletions

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index db19691de..0c5b33f7e 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -133,9 +133,9 @@ External Project Definition
         is determined by inspecting the actual content rather than using logic
         based on the file extension.
 
-      ``URL_HASH ALGO=<value>``
-        Hash of the archive file to be downloaded. The ``<value>`` should be of
-        the form ``algo=hashValue`` where ``algo`` can be any of the hashing
+      ``URL_HASH <algo>=<hashValue>``
+        Hash of the archive file to be downloaded. The argument should be of
+        the form ``<algo>=<hashValue>`` where ``algo`` can be any of the hashing
         algorithms supported by the :command:`file()` command. Specifying this
         option is strongly recommended for URL downloads, as it ensures the
         integrity of the downloaded content. It is also used as a check for a
@@ -1686,7 +1686,7 @@ function(_ep_command_line_to_initial_cache var args force)
   foreach(line ${args})
     if("${line}" MATCHES "^-D(.*)")
       set(line "${CMAKE_MATCH_1}")
-      if(setArg)
+      if(NOT "${setArg}" STREQUAL "")
         # This is required to build up lists in variables, or complete an entry
         string(APPEND setArg "${accumulator}\" CACHE ${type} \"Initial cache\" ${forceArg})")
         string(APPEND script_initial_cache "\n${setArg}")