[Cmake-commits] CMake branch, next, updated. v2.8.5-1478-g7712433

[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  7712433fb55845b723fd39fbf48eb5f282f1901f (commit)
       via  002ddf253c75b88b9eb6b3f4540511178092e903 (commit)
      from  a9a6364a117e437eef3902293820f961bc584cb8 (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=7712433fb55845b723fd39fbf48eb5f282f1901f
commit 7712433fb55845b723fd39fbf48eb5f282f1901f
Merge: a9a6364 002ddf2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 10 08:58:49 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 10 08:58:49 2011 -0400

    Merge topic 'generate_export_header' into next
    
    002ddf2 Fix typo and tests failing as a result.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=002ddf253c75b88b9eb6b3f4540511178092e903
commit 002ddf253c75b88b9eb6b3f4540511178092e903
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 10 14:58:00 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Aug 10 14:58:00 2011 +0200

    Fix typo and tests failing as a result.

diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt
index fd541dc..140b399 100644
--- a/Tests/Module/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt
@@ -44,7 +44,7 @@ macro(_do_build Include Library LibrarySource Source)
 
     "add_compiler_export_flags()\n"
 
-    "if(CMAKE_COMPILER_IS_GNUCXXOR OR (${CMAKE_CXX_COMPILER_ID} MATCHES Clang))\n"
+    "if(CMAKE_COMPILER_IS_GNUCXX OR (${CMAKE_CXX_COMPILER_ID} MATCHES Clang))\n"
     "  add_definitions(-Werror)\n"
     "else()\n"
     "  if(MSVC)\n"

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

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


hooks/post-receive
-- 
CMake