kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'ExternalProject-DEPENDS-target' 

c0f1af9 ExternalProject: Allow DEPENDS on normal targets (#13849)
This commit is contained in:
Brad King 2013-01-23 15:10:44 -05:00 committed by CMake Topic Stage
parent c4c52b3273 c0f1af926f
commit f81e09355b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/ExternalProject.cmake
View File

@ -1558,8 +1558,11 @@ function(_ep_add_configure_command name)
set(file_deps) set(file_deps)
get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS) get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS)
foreach(dep IN LISTS deps) foreach(dep IN LISTS deps)
_ep_get_step_stampfile(${dep} "done" done_stamp_file) get_property(is_ep TARGET ${dep} PROPERTY _EP_IS_EXTERNAL_PROJECT)
list(APPEND file_deps ${done_stamp_file}) if(is_ep)
_ep_get_step_stampfile(${dep} "done" done_stamp_file)
list(APPEND file_deps ${done_stamp_file})
endif()
endforeach() endforeach()
get_property(cmd_set TARGET ${name} PROPERTY _EP_CONFIGURE_COMMAND SET) get_property(cmd_set TARGET ${name} PROPERTY _EP_CONFIGURE_COMMAND SET)

4
Tests/ExternalProject/CMakeLists.txt
View File

@ -50,6 +50,8 @@ if(NOT DEFINED can_build_tutorial_step5)
endif() endif()
endif() endif()
add_custom_target(NonExternalProjectTarget
COMMAND ${CMAKE_COMMAND} -E echo NonExternalProjectTarget)
# Empty projects that test all the known ExternalProject_Add argument key words: # Empty projects that test all the known ExternalProject_Add argument key words:
# #
@ -94,7 +96,7 @@ ExternalProject_Add(${proj}
CVS_REPOSITORY "" CVS_REPOSITORY ""
CVS_MODULE "" CVS_MODULE ""
CVS_TAG "" CVS_TAG ""
DEPENDS "MinimalNoOpProject" DEPENDS "MinimalNoOpProject" NonExternalProjectTarget
DOWNLOAD_COMMAND "" DOWNLOAD_COMMAND ""
INSTALL_COMMAND "" INSTALL_COMMAND ""
PATCH_COMMAND "" PATCH_COMMAND ""