diff options
| author | Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com> | 2018-06-01 22:43:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-04 15:37:52 (GMT) |
| commit | 7ad5165c675d23e9d3f8c076b7cb32a2618e7e96 (patch) | |
| tree | a64ea177501c2bb492a58168500cd6465b0d6f35 /Modules/ExternalProject.cmake | |
| parent | 8738eba336d0f89cd3c183fe32413283abe9140d (diff) | |
| download | CMake-7ad5165c675d23e9d3f8c076b7cb32a2618e7e96.zip CMake-7ad5165c675d23e9d3f8c076b7cb32a2618e7e96.tar.gz CMake-7ad5165c675d23e9d3f8c076b7cb32a2618e7e96.tar.bz2 | |
ExternalProject: Fix cache generation when args end with "-NOTFOUND"
Generalize the fix in commit v3.11.0-rc4~8^2 (ExternalProject: Fix cache
generation when last args ends with "-NOTFOUND", 2018-03-10) to work for
any argument rather than just the last one.
ExternalProject can now successfully generate the cache file when any
(not only the last one) cache variable associated with either
`CMAKE_CACHE_ARGS` or `CMAKE_DEFAULT_CACHE_ARGS` configure step option
is set to a `<value>` ending with `-NOTFOUND`.
Diffstat (limited to 'Modules/ExternalProject.cmake')
| -rw-r--r-- | Modules/ExternalProject.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index db19691..0a1c0c0 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -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}") |