[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1638-g9bbf483

[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  9bbf4839ecf609456cddc48bb2e00c241f144a93 (commit)
       via  bc65b74fa64bdd736eb67b6e579aa1db347f7790 (commit)
       via  c2ab74acb9230d9218091d3fb5e87b6065f98e0b (commit)
      from  e50764e3908c676852f57610d6379d1c7f2b93cf (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=9bbf4839ecf609456cddc48bb2e00c241f144a93
commit 9bbf4839ecf609456cddc48bb2e00c241f144a93
Merge: e50764e bc65b74
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 16 16:04:39 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 16 16:04:39 2013 -0500

    Merge topic 'vs11-external-include' into next
    
    bc65b74 VS11: Fix VSExternalInclude test
    c2ab74a CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc65b74fa64bdd736eb67b6e579aa1db347f7790
commit bc65b74fa64bdd736eb67b6e579aa1db347f7790
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 16 16:00:57 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 16 16:01:45 2013 -0500

    VS11: Fix VSExternalInclude test
    
    Set CMAKE_SUPPRESS_REGENERATION in the Lib1 and Lib2 projects so that
    their .vcxproj files do not contain references to ZERO_CHECK.  Such
    references do not make sense when using the files in another .sln file.
    This does not reduce the effectiveness of the test because real projects
    that use include_external_msproject will have their own .vcxproj files not
    generated by CMake anyway.

diff --git a/Tests/VSExternalInclude/Lib1/CMakeLists.txt b/Tests/VSExternalInclude/Lib1/CMakeLists.txt
index 1cb01c5..9dfac86 100644
--- a/Tests/VSExternalInclude/Lib1/CMakeLists.txt
+++ b/Tests/VSExternalInclude/Lib1/CMakeLists.txt
@@ -1,3 +1,4 @@
+set(CMAKE_SUPPRESS_REGENERATION 1)
 project(LIB1)
 
 set(SOURCES lib1.cpp)
diff --git a/Tests/VSExternalInclude/Lib2/CMakeLists.txt b/Tests/VSExternalInclude/Lib2/CMakeLists.txt
index f726c3f..f451354 100644
--- a/Tests/VSExternalInclude/Lib2/CMakeLists.txt
+++ b/Tests/VSExternalInclude/Lib2/CMakeLists.txt
@@ -1,3 +1,4 @@
+set(CMAKE_SUPPRESS_REGENERATION 1)
 project(VSEXTERNAL_LIB2)
 
 include_directories(${VSEXTERNAL_LIB2_SOURCE_DIR}/../Lib1)

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

Summary of changes:
 Source/CMakeVersion.cmake                   |    2 +-
 Tests/VSExternalInclude/Lib1/CMakeLists.txt |    1 +
 Tests/VSExternalInclude/Lib2/CMakeLists.txt |    1 +
 3 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake