[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1882-g1822848

Sun Feb 3 12:01:07 EST 2013

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  1822848c744dbf9ab978b868d9feea4b929ee712 (commit)
       via  7f59df91ec0c6a364cc221a7009153a8339dd403 (commit)
       via  b4de8705e741690be92382f32fe95b993e38b752 (commit)
       via  b49760e119bb41a8f25cbfee124a25d26b040bdf (commit)
       via  06421101549f2d7ab72a2b6060f40b1cf97462ee (commit)
      from  a154961df04bdfcf99e646db29855001e6ee7ed1 (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=1822848c744dbf9ab978b868d9feea4b929ee712
commit 1822848c744dbf9ab978b868d9feea4b929ee712
Merge: a154961 7f59df9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 3 12:01:06 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 3 12:01:06 2013 -0500

    Merge topic 'add-ExternalData-module' into next
    
    7f59df9 Merge branch 'vs6-rule-files' into add-ExternalData-module
    b4de870 ExternalData: Attach download rules to content links in IDEs
    b49760e Fix Module.ExternalData test on VS 6
    0642110 Fix Module.ExternalData test on Cygwin


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f59df91ec0c6a364cc221a7009153a8339dd403
commit 7f59df91ec0c6a364cc221a7009153a8339dd403
Merge: b4de870 18a93c8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 3 11:50:59 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Feb 3 11:50:59 2013 -0500

    Merge branch 'vs6-rule-files' into add-ExternalData-module


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4de8705e741690be92382f32fe95b993e38b752
commit b4de8705e741690be92382f32fe95b993e38b752
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 3 11:49:47 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Feb 3 11:49:47 2013 -0500

    ExternalData: Attach download rules to content links in IDEs
    
    Each data file to be created in the build tree corresponds one-to-one with
    a raw file or content link in the source tree.  Use the MAIN_DEPENDENCY of
    add_custom_command to attach the build rule to the source tree file.  This
    looks much nicer in the IDE project file browser and avoids ".rule" files.

diff --git a/Modules/ExternalData.cmake b/Modules/ExternalData.cmake
index 825b7b8..9d84f8d 100644
--- a/Modules/ExternalData.cmake
+++ b/Modules/ExternalData.cmake
@@ -191,7 +191,7 @@ function(ExternalData_add_target target)
                                  -DExternalData_ACTION=local
                                  -DExternalData_CONFIG=${config}
                                  -P ${_ExternalData_SELF}
-        DEPENDS "${name}"
+        MAIN_DEPENDENCY "${name}"
         )
       list(APPEND files "${file}")
     endif()
@@ -222,7 +222,7 @@ function(ExternalData_add_target target)
                                  -DExternalData_CONFIG=${config}
                                  -P ${_ExternalData_SELF}
         # Update whenever the object hash changes.
-        DEPENDS "${name}${ext}"
+        MAIN_DEPENDENCY "${name}${ext}"
         )
       list(APPEND files "${file}${stamp}")
     endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b49760e119bb41a8f25cbfee124a25d26b040bdf
commit b49760e119bb41a8f25cbfee124a25d26b040bdf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 3 11:44:05 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Feb 3 11:49:40 2013 -0500

    Fix Module.ExternalData test on VS 6
    
    Run the test with the ctest --build-noclean option.  The test
    CMakeLists.txt file already uses file(REMOVE_RECURSE) to clean out
    downloaded data anyway.  Some file removed by "msdev ... /clean" causes
    CMake to re-run in the middle of the build step and file(REMOVE_RECURSE)
    wipes out already-generated files.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index c21922e..a3044ab 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -319,6 +319,7 @@ if(BUILD_TESTING)
     --build-generator ${CMAKE_TEST_GENERATOR}
     --build-project ExternalDataTest
     --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+    --build-noclean
     --force-new-ctest-process
     --test-command ${CMAKE_CTEST_COMMAND} -C \${CTEST_CONFIGURATION_TYPE} -V
     )

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06421101549f2d7ab72a2b6060f40b1cf97462ee
commit 06421101549f2d7ab72a2b6060f40b1cf97462ee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 3 11:04:57 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Feb 3 11:04:57 2013 -0500

    Fix Module.ExternalData test on Cygwin
    
    In ExternalData_URL_TEMPLATES add a leading slash to the path after
    file:// only if the path does not already start with one.

diff --git a/Tests/Module/ExternalData/CMakeLists.txt b/Tests/Module/ExternalData/CMakeLists.txt
index e69713a..607e9b9 100644
--- a/Tests/Module/ExternalData/CMakeLists.txt
+++ b/Tests/Module/ExternalData/CMakeLists.txt
@@ -4,8 +4,12 @@ project(ExternalDataTest NONE)
 include(CTest)
 
 include(ExternalData)
+
+if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^/")
+  set(slash /)
+endif()
 set(ExternalData_URL_TEMPLATES
-  "file:///${CMAKE_CURRENT_SOURCE_DIR}/%(algo)/%(hash)"
+  "file://${slash}${CMAKE_CURRENT_SOURCE_DIR}/%(algo)/%(hash)"
   )
 set(ExternalData_BINARY_ROOT "${CMAKE_CURRENT_BINARY_DIR}/ExternalData")
 file(REMOVE_RECURSE ${ExternalData_BINARY_ROOT}) # clean test

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

Summary of changes:
 Modules/ExternalData.cmake               |    4 ++--
 Tests/CMakeLists.txt                     |    1 +
 Tests/Module/ExternalData/CMakeLists.txt |    6 +++++-
 3 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake
