diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-22 15:16:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-22 15:16:45 (GMT) |
| commit | 6189cdda796296babe425b48272da17045052dbf (patch) | |
| tree | 1f647295e97477e874535b4a9ff9488a4b49fe8a /Modules | |
| parent | 1468f31988593abdf513e873138a49d758ce8a1c (diff) | |
| parent | e1c6df392bae4f807bbc56f2c4320de412f48721 (diff) | |
| download | CMake-6189cdda796296babe425b48272da17045052dbf.zip CMake-6189cdda796296babe425b48272da17045052dbf.tar.gz CMake-6189cdda796296babe425b48272da17045052dbf.tar.bz2 | |
Merge topic 'ExternalProject-depend-INTERFACE'
e1c6df39 ExternalProject: Allow dependencies on INTERFACE libraries
c0502faa ExternalProject: Fix error message typo
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/ExternalProject.cmake | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index d9b6842..97bebc0 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1539,6 +1539,11 @@ function(ExternalProject_Add_StepDependencies name step) message(FATAL_ERROR "Cannot find target \"${name}\". Perhaps it has not yet been created using ExternalProject_Add.") endif() + get_property(type TARGET ${name} PROPERTY TYPE) + if(NOT type STREQUAL "UTILITY") + message(FATAL_ERROR "Target \"${name}\" was not generated by ExternalProject_Add.") + endif() + get_property(is_ep TARGET ${name} PROPERTY _EP_IS_EXTERNAL_PROJECT) if(NOT is_ep) message(FATAL_ERROR "Target \"${name}\" was not generated by ExternalProject_Add.") @@ -1551,9 +1556,13 @@ function(ExternalProject_Add_StepDependencies name step) endif() if(TARGET ${name}-${step}) + get_property(type TARGET ${name}-${step} PROPERTY TYPE) + if(NOT type STREQUAL "UTILITY") + message(FATAL_ERROR "Target \"${name}-${step}\" was not generated by ExternalProject_Add_StepTargets.") + endif() get_property(is_ep_step TARGET ${name}-${step} PROPERTY _EP_IS_EXTERNAL_PROJECT_STEP) if(NOT is_ep_step) - message(FATAL_ERROR "Target \"${name}\" was not generated by ExternalProject_Add_StepTargets.") + message(FATAL_ERROR "Target \"${name}-${step}\" was not generated by ExternalProject_Add_StepTargets.") endif() endif() @@ -2034,10 +2043,13 @@ function(_ep_add_configure_command name) set(file_deps) get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS) foreach(dep IN LISTS deps) - get_property(is_ep TARGET ${dep} PROPERTY _EP_IS_EXTERNAL_PROJECT) - if(is_ep) - _ep_get_step_stampfile(${dep} "done" done_stamp_file) - list(APPEND file_deps ${done_stamp_file}) + get_property(dep_type TARGET ${dep} PROPERTY TYPE) + if(dep_type STREQUAL "UTILITY") + get_property(is_ep TARGET ${dep} PROPERTY _EP_IS_EXTERNAL_PROJECT) + if(is_ep) + _ep_get_step_stampfile(${dep} "done" done_stamp_file) + list(APPEND file_deps ${done_stamp_file}) + endif() endif() endforeach() |