[Cmake-commits] CMake branch, next, updated. v2.8.8-3416-gdc22cb5

[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  dc22cb53348ecdbf0ebbe2d789dad2d4dfd2cef2 (commit)
       via  d54618f36e8df26906b433577051ca818b0765d2 (commit)
      from  a49794321466ebf41a18b120152f1b1cbd1ab21f (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=dc22cb53348ecdbf0ebbe2d789dad2d4dfd2cef2
commit dc22cb53348ecdbf0ebbe2d789dad2d4dfd2cef2
Merge: a497943 d54618f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 9 17:17:22 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 9 17:17:22 2012 -0400

    Merge topic 'fix-CustomCommand-main' into next
    
    d54618f Tests/CustomCommand: Do not use 'main' in a library


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d54618f36e8df26906b433577051ca818b0765d2
commit d54618f36e8df26906b433577051ca818b0765d2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 9 17:04:48 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 9 17:15:35 2012 -0400

    Tests/CustomCommand: Do not use 'main' in a library
    
    Otherwise when linking 'CustomCommand' some linkers report
    
     ld: 0711-224 WARNING: Duplicate symbol: .main
    
    Suggested-by: Daniel R. Gomez <gomez at teragram.com>

diff --git a/Tests/CustomCommand/GeneratedHeader/main.cpp b/Tests/CustomCommand/GeneratedHeader/main.cpp
index 1b3e85f..0b43ffe 100644
--- a/Tests/CustomCommand/GeneratedHeader/main.cpp
+++ b/Tests/CustomCommand/GeneratedHeader/main.cpp
@@ -1,5 +1,5 @@
 #include "generated.h"
-int main()
+int mainGeneratedHeader()
 {
   return 0;
 }

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

Summary of changes:
 Tests/CustomCommand/GeneratedHeader/main.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake