diff options
| author | Brad King <brad.king@kitware.com> | 2013-05-28 14:42:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-05-28 14:42:33 (GMT) |
| commit | 07942da96cc2db73877f0ed916edf16dc9476a85 (patch) | |
| tree | cde951b48c9a5c403ae793588655a678cf38acf9 /Modules/ExternalData.cmake | |
| parent | 93e9291da73b845ac8c7e70921a4deb400f4f1fc (diff) | |
| parent | c35961b010da87492a60afb6e5dd7436ea36ed8b (diff) | |
| download | CMake-07942da96cc2db73877f0ed916edf16dc9476a85.zip CMake-07942da96cc2db73877f0ed916edf16dc9476a85.tar.gz CMake-07942da96cc2db73877f0ed916edf16dc9476a85.tar.bz2 | |
Merge topic 'ExternalData-no-re-stage'
c35961b ExternalData: Do not re-stage staged object files
Diffstat (limited to 'Modules/ExternalData.cmake')
| -rw-r--r-- | Modules/ExternalData.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/ExternalData.cmake b/Modules/ExternalData.cmake index 187f408..8332725 100644 --- a/Modules/ExternalData.cmake +++ b/Modules/ExternalData.cmake @@ -551,7 +551,10 @@ function(_ExternalData_arg_find_files pattern regex) set(relname "${entry}") set(alg "") endif() - if("x${relname}" MATCHES "^x${regex}$" AND NOT IS_DIRECTORY "${top_src}/${entry}") + if("x${relname}" MATCHES "^x${regex}$" # matches + AND NOT IS_DIRECTORY "${top_src}/${entry}" # not a directory + AND NOT "x${relname}" MATCHES "(^x|/)\\.ExternalData_" # not staged obj + ) set(name "${top_src}/${relname}") set(file "${top_bin}/${relname}") if(alg) |