[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-876-gfb5ced8

Brad King brad.king at kitware.com
Wed Mar 12 10:42:33 EDT 2014


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  fb5ced8dabbdfd9f2640f21b37a6dd46ca280423 (commit)
       via  3be265b304da0879c79e2fcdfff6f25b1a4e87c1 (commit)
      from  0d77ee8e1fcf5771eb4e5840194e6f8cb0cdfc1a (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=fb5ced8dabbdfd9f2640f21b37a6dd46ca280423
commit fb5ced8dabbdfd9f2640f21b37a6dd46ca280423
Merge: 0d77ee8 3be265b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 12 10:42:32 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 12 10:42:32 2014 -0400

    Merge topic 'remove-c_str-calls' into next
    
    3be265b3 Workaround Sun C++ 5.9 compiler crash


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3be265b304da0879c79e2fcdfff6f25b1a4e87c1
commit 3be265b304da0879c79e2fcdfff6f25b1a4e87c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 12 10:39:23 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 12 10:40:45 2014 -0400

    Workaround Sun C++ 5.9 compiler crash
    
    Adjust whitespace in Source/CPack/cpack.cxx to avoid a strange
    internal compiler crash.

diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 7ebfeda..9eabdca 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -275,8 +275,8 @@ int main (int argc, char const* const* argv)
     else if ( cpackConfigFileSpecified )
       {
       cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
-        "Cannot find CPack config file: \"" << cpackConfigFile
-        << "\"" << std::endl);
+        "Cannot find CPack config file: \"" <<
+         cpackConfigFile << "\"" << std::endl);
       return 1;
       }
 

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

Summary of changes:
 Source/CPack/cpack.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list