[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2748-g33383f2

[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  33383f27c630a3661d808ac3f87afc54a855bb8a (commit)
       via  02bfd974274b191fc8bd2ae5eb3d44a8b973b62c (commit)
      from  98f389eb19d3f56de0c8d68d50be7a3be6a3577a (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=33383f27c630a3661d808ac3f87afc54a855bb8a
commit 33383f27c630a3661d808ac3f87afc54a855bb8a
Merge: 98f389e 02bfd97
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 10 13:59:09 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 10 13:59:09 2013 -0400

    Merge topic 'msbuild-targets-in-subdirs' into next
    
    02bfd97 Cygwin: Do not build testVisualStudioSlnParser


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02bfd974274b191fc8bd2ae5eb3d44a8b973b62c
commit 02bfd974274b191fc8bd2ae5eb3d44a8b973b62c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 10 13:56:02 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 10 13:57:50 2013 -0400

    Cygwin: Do not build testVisualStudioSlnParser
    
    When CMake is built with a CMake version older than 2.8.4 then
    WIN32 will be defined on Cygwin.  Build the test only under the
    same conditions as we build what it tests.

diff --git a/Tests/CMakeLib/CMakeLists.txt b/Tests/CMakeLib/CMakeLists.txt
index 070c9cc..a831e30 100644
--- a/Tests/CMakeLib/CMakeLists.txt
+++ b/Tests/CMakeLib/CMakeLists.txt
@@ -12,7 +12,7 @@ set(CMakeLib_TESTS
   testXMLSafe
   )
 
-if(WIN32)
+if(WIN32 AND NOT UNIX) # Just if(WIN32) when CMake >= 2.8.4 is required
   list(APPEND CMakeLib_TESTS
     testVisualStudioSlnParser
     )

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

Summary of changes:
 Tests/CMakeLib/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake