[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1907-g22c83a1

Brad King brad.king at kitware.com
Mon Feb 4 15:21:34 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  22c83a198c09b939ff0b0b9eb76cbef6d1ae6754 (commit)
       via  5484c6069409331a8054190d9bae874d5b3c3bff (commit)
       via  1fd8d017e6b548520b7f2aa8dcc6ce39a2ec3137 (commit)
       via  a6d3ffcb1fa71395cb0d865b3c79450280554651 (commit)
       via  aed590a7e0c135f2466fb19cfe09674c687432ab (commit)
       via  06e8dedb3c1412625b146b214cb542f0577c923c (commit)
      from  3c378f2f164195d51bdc9e99cf21d63bb89af314 (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=22c83a198c09b939ff0b0b9eb76cbef6d1ae6754
commit 22c83a198c09b939ff0b0b9eb76cbef6d1ae6754
Merge: 3c378f2 5484c60
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 4 15:21:29 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 4 15:21:29 2013 -0500

    Merge topic 'add-ExternalData-module' into next
    
    5484c60 Merge branch 'vs6-rule-files' into add-ExternalData-module
    1fd8d01 ExternalData: Attach download rules to content links in IDEs
    a6d3ffc Fix Module.ExternalData test on VS 6
    aed590a Fix Module.ExternalData test on Cygwin
    06e8ded Merge branch 'fix-atomic-rename-on-Windows' into add-ExternalData-module


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5484c6069409331a8054190d9bae874d5b3c3bff
commit 5484c6069409331a8054190d9bae874d5b3c3bff
Merge: 1fd8d01 0f24a66
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 3 12:04:12 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 4 15:20:18 2013 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1fd8d017e6b548520b7f2aa8dcc6ce39a2ec3137
commit 1fd8d017e6b548520b7f2aa8dcc6ce39a2ec3137
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: Mon Feb 4 15:20:03 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=a6d3ffcb1fa71395cb0d865b3c79450280554651
commit a6d3ffcb1fa71395cb0d865b3c79450280554651
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: Mon Feb 4 15:19:56 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=aed590a7e0c135f2466fb19cfe09674c687432ab
commit aed590a7e0c135f2466fb19cfe09674c687432ab
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: Mon Feb 4 15:19:49 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

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06e8dedb3c1412625b146b214cb542f0577c923c
commit 06e8dedb3c1412625b146b214cb542f0577c923c
Merge: e2e0d2e 59b568e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 31 15:41:33 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 4 15:19:33 2013 -0500

    Merge branch 'fix-atomic-rename-on-Windows' into add-ExternalData-module


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

Summary of changes:


hooks/post-receive
-- 
CMake

More information about the Cmake-commits mailing list