[Cmake-commits] CMake branch, next, updated. v2.8.8-2988-g19a6e8f

[Stephen Kelly]

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  19a6e8f2db9307e2ea8624a89cd5a203efab7837 (commit)
       via  3545645c1b01f609496a4fc41e20419dedbbd98d (commit)
      from  396e39cd274459d40070e1ec486e3cafb843dbac (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=19a6e8f2db9307e2ea8624a89cd5a203efab7837
commit 19a6e8f2db9307e2ea8624a89cd5a203efab7837
Merge: 396e39c 3545645
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jun 4 18:15:41 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 4 18:15:41 2012 -0400

    Merge topic 'Ninja-EXPORT_COMPILE_COMMANDS' into next
    
    3545645 Exclude the CompileCommandOutput test on WIN32.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3545645c1b01f609496a4fc41e20419dedbbd98d
commit 3545645c1b01f609496a4fc41e20419dedbbd98d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jun 5 00:12:16 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jun 5 00:12:16 2012 +0200

    Exclude the CompileCommandOutput test on WIN32.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index ffa5bcb..ef707e4 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -47,7 +47,7 @@ CONFIGURE_FILE(${CMake_SOURCE_DIR}/Tests/EnforceConfig.cmake.in
 
 # Testing
 IF(BUILD_TESTING)
-  IF("${CMAKE_TEST_GENERATOR}" MATCHES "Unix Makefiles" OR "${CMAKE_TEST_GENERATOR}" MATCHES Ninja)
+  IF("${CMAKE_TEST_GENERATOR}" MATCHES "Unix Makefiles" OR ("${CMAKE_TEST_GENERATOR}" MATCHES Ninja AND NOT WIN32))
     SET(TEST_CompileCommandOutput 1)
   ENDIF()
 

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

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


hooks/post-receive
-- 
CMake