[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2757-ge9f70ab

[Daniele E. Domenichelli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e9f70ab1dd5f7b6454a9c769a2f238581db47951 (commit)
       via  93730bb3e05e7f9ced8bd0bc7810b8697e464cf4 (commit)
       via  39ef80460213d666a5041bd416337c2e09e00283 (commit)
      from  da090ee84dbfb6397a4899a7c8d6bc006a79a613 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e9f70ab1dd5f7b6454a9c769a2f238581db47951
commit e9f70ab1dd5f7b6454a9c769a2f238581db47951
Merge: da090ee 93730bb
Author:     Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Mon May 5 12:50:26 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 5 12:50:26 2014 -0400

    Merge topic 'ExternalProject_labels' into next
    
    93730bb3 ExternalProject: Set FOLDER property to targets
    39ef8046 ExternalProject: Set LABELS property to targets


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93730bb3e05e7f9ced8bd0bc7810b8697e464cf4
commit 93730bb3e05e7f9ced8bd0bc7810b8697e464cf4
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Tue Apr 29 11:41:12 2014 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Mon May 5 18:49:41 2014 +0200

    ExternalProject: Set FOLDER property to targets
    
    This is useful when using the USE_FOLDERS global property

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index cf44f80..0d35cca 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)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39ef80460213d666a5041bd416337c2e09e00283
commit 39ef80460213d666a5041bd416337c2e09e00283
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Mon Apr 7 15:42:44 2014 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Mon May 5 18:49:41 2014 +0200

    ExternalProject: Set LABELS property to targets
    
    This is useful for using CDash subprojects.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index fc31ce4..cf44f80 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)

-----------------------------------------------------------------------

Summary of changes:
 Modules/ExternalProject.cmake |    5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
CMake