From 39ef80460213d666a5041bd416337c2e09e00283 Mon Sep 17 00:00:00 2001 From: "Daniele E. Domenichelli" Date: Mon, 7 Apr 2014 15:42:44 +0200 Subject: [PATCH 1/2] ExternalProject: Set LABELS property to targets This is useful for using CDash subprojects. --- Modules/ExternalProject.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index fc31ce4a3..cf44f80cb 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1176,6 +1176,7 @@ function(ExternalProject_Add_StepTargets name) _ep_get_step_stampfile(${name} ${step} stamp_file) add_custom_target(${name}-${step} DEPENDS ${stamp_file}) + set_property(TARGET ${name}-${step} PROPERTY LABELS ${name}) # Depend on other external projects (target-level). get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS) @@ -1918,6 +1919,7 @@ function(ExternalProject_Add name) # argument was passed, we explicitly set it for the target. add_custom_target(${name} ALL DEPENDS ${complete_stamp_file}) set_property(TARGET ${name} PROPERTY _EP_IS_EXTERNAL_PROJECT 1) + set_property(TARGET ${name} PROPERTY LABELS ${name}) _ep_parse_arguments(ExternalProject_Add ${name} _EP_ "${ARGN}") _ep_set_directories(${name}) _ep_get_step_stampfile(${name} "done" done_stamp_file) From 93730bb3e05e7f9ced8bd0bc7810b8697e464cf4 Mon Sep 17 00:00:00 2001 From: "Daniele E. Domenichelli" Date: Tue, 29 Apr 2014 11:41:12 +0200 Subject: [PATCH 2/2] ExternalProject: Set FOLDER property to targets This is useful when using the USE_FOLDERS global property --- Modules/ExternalProject.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index cf44f80cb..0d35cca1e 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1177,6 +1177,7 @@ function(ExternalProject_Add_StepTargets name) add_custom_target(${name}-${step} DEPENDS ${stamp_file}) set_property(TARGET ${name}-${step} PROPERTY LABELS ${name}) + set_property(TARGET ${name}-${step} PROPERTY FOLDER "ExternalProjectTargets/${name}") # Depend on other external projects (target-level). get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS) @@ -1920,6 +1921,8 @@ function(ExternalProject_Add name) add_custom_target(${name} ALL DEPENDS ${complete_stamp_file}) set_property(TARGET ${name} PROPERTY _EP_IS_EXTERNAL_PROJECT 1) set_property(TARGET ${name} PROPERTY LABELS ${name}) + set_property(TARGET ${name} PROPERTY FOLDER "ExternalProjectTargets/${name}") + _ep_parse_arguments(ExternalProject_Add ${name} _EP_ "${ARGN}") _ep_set_directories(${name}) _ep_get_step_stampfile(${name} "done" done_stamp_file)