diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-18 16:56:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-18 16:56:13 (GMT) |
| commit | e3cb3116bca6e0dd6cc5976fa927221a406ffe3d (patch) | |
| tree | c0e4eb31bfeaf5452136dbe92d5b6e68d0b09b46 | |
| parent | df68d8a17ed14b6c5a38dca9c95d88bcc6da243c (diff) | |
| parent | 615f3ed2b43129bd7d2466d369beef3003e1e0de (diff) | |
| download | CMake-e3cb3116bca6e0dd6cc5976fa927221a406ffe3d.zip CMake-e3cb3116bca6e0dd6cc5976fa927221a406ffe3d.tar.gz CMake-e3cb3116bca6e0dd6cc5976fa927221a406ffe3d.tar.bz2 | |
Merge branch 'external-project-source-subdir-usage' into release
| -rw-r--r-- | Modules/ExternalProject.cmake | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 4ba8537..4551cc8 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1087,10 +1087,14 @@ function(_ep_set_directories name) endforeach() get_property(source_subdir TARGET ${name} PROPERTY _EP_SOURCE_SUBDIR) if(NOT source_subdir) - set_property(TARGET ${name} PROPERTY _EP_SOURCE_SUBDIR ".") + set_property(TARGET ${name} PROPERTY _EP_SOURCE_SUBDIR "") elseif(IS_ABSOLUTE "${source_subdir}") message(FATAL_ERROR "External project ${name} has non-relative SOURCE_SUBDIR!") + else() + # Prefix with a slash so that when appended to the source directory, it + # behaves as expected. + set_property(TARGET ${name} PROPERTY _EP_SOURCE_SUBDIR "/${source_subdir}") endif() if(build_in_source) get_property(source_dir TARGET ${name} PROPERTY _EP_SOURCE_DIR) @@ -1184,10 +1188,11 @@ endfunction() function(ExternalProject_Get_Property name) foreach(var ${ARGN}) string(TOUPPER "${var}" VAR) - get_property(${var} TARGET ${name} PROPERTY _EP_${VAR}) - if(NOT ${var}) + get_property(is_set TARGET ${name} PROPERTY _EP_${VAR} SET) + if(NOT is_set) message(FATAL_ERROR "External project \"${name}\" has no ${var}") endif() + get_property(${var} TARGET ${name} PROPERTY _EP_${VAR}) set(${var} "${${var}}" PARENT_SCOPE) endforeach() endfunction() @@ -2256,11 +2261,7 @@ function(_ep_add_configure_command name) endif() endif() - if(source_subdir STREQUAL ".") - list(APPEND cmd "${source_dir}") - else() - list(APPEND cmd "${source_dir}/${source_subdir}") - endif() + list(APPEND cmd "${source_dir}${source_subdir}") endif() # If anything about the configure command changes, (command itself, cmake |