[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1635-ge50764e

[Brad King]

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  e50764e3908c676852f57610d6379d1c7f2b93cf (commit)
       via  c0f1af926feb3494ada1a311441ea144926157a2 (commit)
      from  881b75f62d67e8d62a26893da45717824dbb0c03 (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=e50764e3908c676852f57610d6379d1c7f2b93cf
commit e50764e3908c676852f57610d6379d1c7f2b93cf
Merge: 881b75f c0f1af9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 16 10:36:14 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 16 10:36:14 2013 -0500

    Merge topic 'ExternalProject-DEPENDS-target' into next
    
    c0f1af9 ExternalProject: Allow DEPENDS on normal targets (#13849)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0f1af926feb3494ada1a311441ea144926157a2
commit c0f1af926feb3494ada1a311441ea144926157a2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 16 09:10:48 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 16 10:35:58 2013 -0500

    ExternalProject: Allow DEPENDS on normal targets (#13849)
    
    The ExternalProject_Add DEPENDS option adds two types of dependencies.
    It adds a target-level build order dependency between the external
    project target and the named targets.  It also adds a file-level
    dependency on the "done" stamp file of the named external project
    targets.  Targets not created by ExternalProject_Add have no such stamp
    file and no _EP_STAMP_DIR property.  Prior to commit d14c0243 (Refactor
    repeated code into function, 2012-04-26) we unconditionally accepted an
    empty stamp dir and generated a dependency on a non-existent file.
    After that commit we generate an error that no stamp dir is set.
    
    Skip the file-level dependency when the named dependency is not an
    external project target in order to allow this use case.  Teach the
    ExternalProject test to cover the case.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 2355dac..ed7fd7c 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1558,8 +1558,11 @@ function(_ep_add_configure_command name)
   set(file_deps)
   get_property(deps TARGET ${name} PROPERTY _EP_DEPENDS)
   foreach(dep IN LISTS deps)
-    _ep_get_step_stampfile(${dep} "done" done_stamp_file)
-    list(APPEND file_deps ${done_stamp_file})
+    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()
   endforeach()
 
   get_property(cmd_set TARGET ${name} PROPERTY _EP_CONFIGURE_COMMAND SET)
diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt
index e24a979..602ff0f 100644
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@ -50,6 +50,8 @@ if(NOT DEFINED can_build_tutorial_step5)
   endif()
 endif()
 
+add_custom_target(NonExternalProjectTarget
+  COMMAND ${CMAKE_COMMAND} -E echo NonExternalProjectTarget)
 
 # Empty projects that test all the known ExternalProject_Add argument key words:
 #
@@ -94,7 +96,7 @@ ExternalProject_Add(${proj}
   CVS_REPOSITORY ""
   CVS_MODULE ""
   CVS_TAG ""
-  DEPENDS "MinimalNoOpProject"
+  DEPENDS "MinimalNoOpProject" NonExternalProjectTarget
   DOWNLOAD_COMMAND ""
   INSTALL_COMMAND ""
   PATCH_COMMAND ""

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

Summary of changes:


hooks/post-receive
-- 
CMake