[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2294-g9c22988

[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  9c229880e9de7980606a294f69e7e79a9c8d0869 (commit)
       via  efa007ea9d7821ffd0b992eaf02f5d694342a6c8 (commit)
       via  602536fb76502311f3d19a7c91bf1e0edd5e4613 (commit)
      from  cc2eeafb5f1c0e2cb8f4fb1df0abb24c3c04b3f1 (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=9c229880e9de7980606a294f69e7e79a9c8d0869
commit 9c229880e9de7980606a294f69e7e79a9c8d0869
Merge: cc2eeaf efa007e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 14 09:56:16 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 14 09:56:16 2014 -0400

    Merge topic 'ninja-link-with-compile-flags' into next
    
    efa007ea Ninja: Avoid using std::string::clear
    602536fb MinGW: Do not link executables with compiler flags


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efa007ea9d7821ffd0b992eaf02f5d694342a6c8
commit efa007ea9d7821ffd0b992eaf02f5d694342a6c8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 14 09:54:14 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 14 09:55:36 2014 -0400

    Ninja: Avoid using std::string::clear

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 4874a5c..e7e811b 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -485,7 +485,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
     std::string t = vars["ARCH_FLAGS"];
     localGen.AddArchitectureFlags(t, &genTarget, TargetLinkLanguage, cfgName);
     vars["ARCH_FLAGS"] = t;
-    t.clear();
+    t = "";
     localGen.AddLanguageFlags(t, TargetLinkLanguage, cfgName);
     vars["LANGUAGE_COMPILE_FLAGS"] = t;
     }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=602536fb76502311f3d19a7c91bf1e0edd5e4613
commit 602536fb76502311f3d19a7c91bf1e0edd5e4613
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 14 09:52:32 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 14 09:52:32 2014 -0400

    MinGW: Do not link executables with compiler flags

diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index ab7474c..b5e174b 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -117,7 +117,7 @@ macro(__windows_compiler_gnu lang)
   set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
     "<CMAKE_${lang}_COMPILER> <CMAKE_SHARED_LIBRARY_${lang}_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS> -o <TARGET> -Wl,--out-implib,<TARGET_IMPLIB> ${CMAKE_GNULD_IMAGE_VERSION} <OBJECTS> <LINK_LIBRARIES>")
   set(CMAKE_${lang}_LINK_EXECUTABLE
-    "<CMAKE_${lang}_COMPILER> <FLAGS> <CMAKE_${lang}_LINK_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> -Wl,--out-implib,<TARGET_IMPLIB> ${CMAKE_GNULD_IMAGE_VERSION} <LINK_LIBRARIES>")
+    "<CMAKE_${lang}_COMPILER> <FLAGS> <CMAKE_${lang}_LINK_FLAGS> <LINK_FLAGS> <OBJECTS>  -o <TARGET> -Wl,--out-implib,<TARGET_IMPLIB> ${CMAKE_GNULD_IMAGE_VERSION} <LINK_LIBRARIES>")
 
   list(APPEND CMAKE_${lang}_ABI_FILES "Platform/Windows-GNU-${lang}-ABI")
 

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

Summary of changes:
 Modules/Platform/Windows-GNU.cmake      |    2 +-
 Source/cmNinjaNormalTargetGenerator.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake