[Cmake-commits] CMake branch, next, updated. v2.8.5-1701-g6ceb316

[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  6ceb3165edf40f5ba55d593c65e08b35047946a4 (commit)
       via  36d28f2e6b60b684fa26dc8b906dcf51a5c93a0f (commit)
      from  54ec3246c84d6954b175c0e64b325b9d73d99a11 (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=6ceb3165edf40f5ba55d593c65e08b35047946a4
commit 6ceb3165edf40f5ba55d593c65e08b35047946a4
Merge: 54ec324 36d28f2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 24 14:22:36 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 24 14:22:36 2011 -0400

    Merge topic 'generate_export_header' into next
    
    36d28f2 Fix Compiler id variable name.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36d28f2e6b60b684fa26dc8b906dcf51a5c93a0f
commit 36d28f2e6b60b684fa26dc8b906dcf51a5c93a0f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 24 20:21:30 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 24 20:21:30 2011 +0200

    Fix Compiler id variable name.

diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index 5372f92..fee836e 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.5 FATAL_ERROR)
 project(GenerateExportHeader)
 
 # Prevent timeout on Watcom by not running the tests.
-if ("${CMAKE_COMPILER_ID}" MATCHES Watcom)
+if ("${CMAKE_CXX_COMPILER_ID}" MATCHES Watcom)
   file(WRITE
     "${CMAKE_CURRENT_BINARY_DIR}/main.cxx"
     "int main() { return 0; }

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

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


hooks/post-receive
-- 
CMake