[Cmake-commits] CMake branch, next, updated. v3.2.3-1483-geb67250

[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  eb672500311c81c1922399cf6095852a0612bbef (commit)
       via  f2bac56eaa50204f5f2ce188607f622e7bff633f (commit)
      from  f8845e56f4b494189403bead9186257e84b99969 (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=eb672500311c81c1922399cf6095852a0612bbef
commit eb672500311c81c1922399cf6095852a0612bbef
Merge: f8845e5 f2bac56
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 4 11:31:28 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 4 11:31:28 2015 -0400

    Merge topic 'ExternalProject_init_selected_submodules' into next
    
    f2bac56e fixup! ExternalProject: Add unit tests for GIT_SUBMODULES argument


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2bac56eaa50204f5f2ce188607f622e7bff633f
commit f2bac56eaa50204f5f2ce188607f622e7bff633f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 4 11:07:16 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 4 11:07:19 2015 -0400

    fixup! ExternalProject: Add unit tests for GIT_SUBMODULES argument
    
    Use shorter names to avoid Windows path length limits.

diff --git a/Tests/ExternalProject/CMakeLists.txt b/Tests/ExternalProject/CMakeLists.txt
index eef00ea..b5041c7 100644
--- a/Tests/ExternalProject/CMakeLists.txt
+++ b/Tests/ExternalProject/CMakeLists.txt
@@ -380,13 +380,13 @@ if(do_git_tests)
 
   set(local_git_repo "../../LocalRepositories/GIT-with-submodules")
 
-  set(proj TutorialStep1-GIT-with-no-GIT_SUBMODULES)
+  set(proj TS1-GIT-no-GIT_SUBMODULES)
   ExternalProject_Add(${proj}
     GIT_REPOSITORY "${local_git_repo}"
     CMAKE_GENERATOR "${CMAKE_GENERATOR}"
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-               -DWITH_submodule1:BOOL=ON
-               -DWITH_submodule2:BOOL=ON
+               -DWITH_m1:BOOL=ON
+               -DWITH_m2:BOOL=ON
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
     DEPENDS "SetupLocalGITRepository"
@@ -394,14 +394,14 @@ if(do_git_tests)
   )
   set_property(TARGET ${proj} PROPERTY FOLDER "GIT")
 
-  set(proj TutorialStep1-GIT-with-empty-GIT_SUBMODULES)
+  set(proj TS1-GIT-empty-GIT_SUBMODULES)
   ExternalProject_Add(${proj}
     GIT_REPOSITORY "${local_git_repo}"
     GIT_SUBMODULES ""
     CMAKE_GENERATOR "${CMAKE_GENERATOR}"
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-               -DWITH_submodule1:BOOL=ON
-               -DWITH_submodule2:BOOL=ON
+               -DWITH_m1:BOOL=ON
+               -DWITH_m2:BOOL=ON
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
     DEPENDS "SetupLocalGITRepository"
@@ -409,14 +409,14 @@ if(do_git_tests)
   )
   set_property(TARGET ${proj} PROPERTY FOLDER "GIT")
 
-  set(proj TutorialStep1-GIT-with-some-GIT_SUBMODULES)
+  set(proj TS1-GIT-some-GIT_SUBMODULES)
   ExternalProject_Add(${proj}
     GIT_REPOSITORY "${local_git_repo}"
-    GIT_SUBMODULES "submodules/submodule1"
+    GIT_SUBMODULES "m/m1"
     CMAKE_GENERATOR "${CMAKE_GENERATOR}"
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-               -DWITH_submodule1:BOOL=ON
-               -DWITH_submodule2:BOOL=OFF
+               -DWITH_m1:BOOL=ON
+               -DWITH_m2:BOOL=OFF
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
     DEPENDS "SetupLocalGITRepository"
diff --git a/Tests/ExternalProject/gitrepo-sub.tgz b/Tests/ExternalProject/gitrepo-sub.tgz
index 72c8eb1..c0b5360 100644
Binary files a/Tests/ExternalProject/gitrepo-sub.tgz and b/Tests/ExternalProject/gitrepo-sub.tgz differ

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

Summary of changes:
 Tests/ExternalProject/CMakeLists.txt  |   20 ++++++++++----------
 Tests/ExternalProject/gitrepo-sub.tgz |  Bin 1833 -> 1911 bytes
 2 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake