[Cmake-commits] CMake branch, next, updated. v3.5.0-555-g67ad922

[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  67ad9220b9adcf44680d44d7bd01414233b586fd (commit)
       via  32dc36be8362318437e8585e90a513af8ebb904a (commit)
      from  8a7f5803d50b3ca52ba0bdf07ca13b7c70b087d9 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67ad9220b9adcf44680d44d7bd01414233b586fd
commit 67ad9220b9adcf44680d44d7bd01414233b586fd
Merge: 8a7f580 32dc36b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 21 09:41:23 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 21 09:41:23 2016 -0400

    Merge topic 'vs-startup-project' into next
    
    32dc36be fixup! VS: Add option to choose the `.sln` startup project (#15578)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32dc36be8362318437e8585e90a513af8ebb904a
commit 32dc36be8362318437e8585e90a513af8ebb904a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 21 09:40:45 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 21 09:40:45 2016 -0400

    fixup! VS: Add option to choose the `.sln` startup project (#15578)

diff --git a/Tests/RunCMake/VSSolution/StartupProject-check.cmake b/Tests/RunCMake/VSSolution/StartupProject-check.cmake
index fd7cc28..352bbd5 100644
--- a/Tests/RunCMake/VSSolution/StartupProject-check.cmake
+++ b/Tests/RunCMake/VSSolution/StartupProject-check.cmake
@@ -1,4 +1,4 @@
 getFirstProject(first_project StartupProject)
-if(NOT first_project STREQUAL "ZERO_CHECK")
-  error("ZERO_CHECK is not the startup project")
+if(NOT first_project STREQUAL "TestStartup")
+  error("TestStartup is not the startup project")
 endif()
diff --git a/Tests/RunCMake/VSSolution/StartupProject.cmake b/Tests/RunCMake/VSSolution/StartupProject.cmake
index 8ba4e3e..7192f3d 100644
--- a/Tests/RunCMake/VSSolution/StartupProject.cmake
+++ b/Tests/RunCMake/VSSolution/StartupProject.cmake
@@ -1 +1,2 @@
-set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT "ZERO_CHECK")
+add_custom_target(TestStartup)
+set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT "TestStartup")

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

Summary of changes:
 Tests/RunCMake/VSSolution/StartupProject-check.cmake |    4 ++--
 Tests/RunCMake/VSSolution/StartupProject.cmake       |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake