[Cmake-commits] CMake branch, next, updated. v3.7.0-1384-g45db276

[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  45db27654cf20ced2b6f2936b6b93e91534b82ec (commit)
       via  51c964511ee52c89370e15fd7968d54368e7cb3e (commit)
      from  aafa5e76c80c4850a7767d47fb8026d70b4b9a52 (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=45db27654cf20ced2b6f2936b6b93e91534b82ec
commit 45db27654cf20ced2b6f2936b6b93e91534b82ec
Merge: aafa5e7 51c9645
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 29 08:46:01 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 29 08:46:01 2016 -0500

    Merge topic 'vs-default-build-package' into next
    
    51c96451 fixup! VS: Add option to place `PACKAGE` target in solution default build


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51c964511ee52c89370e15fd7968d54368e7cb3e
commit 51c964511ee52c89370e15fd7968d54368e7cb3e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 29 08:45:35 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 29 08:45:35 2016 -0500

    fixup! VS: Add option to place `PACKAGE` target in solution default build

diff --git a/Tests/RunCMake/VSSolution/AddPackageToDefault-check.cmake b/Tests/RunCMake/VSSolution/AddPackageToDefault-check.cmake
index 402f6d5..7265900 100644
--- a/Tests/RunCMake/VSSolution/AddPackageToDefault-check.cmake
+++ b/Tests/RunCMake/VSSolution/AddPackageToDefault-check.cmake
@@ -10,7 +10,7 @@ set(packageInBuild FALSE)
 file(STRINGS "${vcSlnFile}" lines)
 foreach(line IN LISTS lines)
   if(NOT packageGuidFound)
-    if(line MATCHES "^Project.*\"PACKAGE.vcxproj\".*\"{([A-F0-9-]+)}\"$")
+    if(line MATCHES "^Project.*\"PACKAGE.vcx?proj\".*\"{([A-F0-9-]+)}\"$")
       set(packageGuidFound TRUE)
       set(packageGuid ${CMAKE_MATCH_1})
     endif()

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

Summary of changes:
 Tests/RunCMake/VSSolution/AddPackageToDefault-check.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake