[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3238-g4bb54f7

[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  4bb54f7ace4fb3a46358d730c9c3f9d03411d649 (commit)
       via  d1035bd5a54a523061ccae707e6a0ff193b9de09 (commit)
       via  96eb97f89e1dc3cb843fb5f50c7d48dc9fa0516b (commit)
       via  0dffbb93def3bd7922da7bd38ba9f8d19c49da17 (commit)
      from  fe7e36a8b3e98a1d0575f4e27952d50783ada53d (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=4bb54f7ace4fb3a46358d730c9c3f9d03411d649
commit 4bb54f7ace4fb3a46358d730c9c3f9d03411d649
Merge: fe7e36a d1035bd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 20 10:53:36 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 20 10:53:36 2014 -0400

    Merge topic 'minor-cleanups' into next
    
    d1035bd5 cmTarget: Avoid copying container we don't need to copy.
    96eb97f8 Help: Fix whitespace in doc link.
    0dffbb93 Features: Ensure that list exists to remove from.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1035bd5a54a523061ccae707e6a0ff193b9de09
commit d1035bd5a54a523061ccae707e6a0ff193b9de09
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 20 16:45:29 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 20 16:45:29 2014 +0200

    cmTarget: Avoid copying container we don't need to copy.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 86842a4..786021e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1220,7 +1220,7 @@ void cmTarget::GetDirectLinkLibraries(const std::string& config,
                                         &dagChecker),
                                       libs);
 
-    std::set<std::string> seenProps = cge->GetSeenTargetProperties();
+    std::set<std::string> const& seenProps = cge->GetSeenTargetProperties();
     for (std::set<std::string>::const_iterator it = seenProps.begin();
         it != seenProps.end(); ++it)
       {

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96eb97f89e1dc3cb843fb5f50c7d48dc9fa0516b
commit 96eb97f89e1dc3cb843fb5f50c7d48dc9fa0516b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 20 16:44:06 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 20 16:44:06 2014 +0200

    Help: Fix whitespace in doc link.

diff --git a/Help/command/add_compile_options.rst b/Help/command/add_compile_options.rst
index 5d71e11..214f4be 100644
--- a/Help/command/add_compile_options.rst
+++ b/Help/command/add_compile_options.rst
@@ -14,7 +14,7 @@ alternative commands exist to add preprocessor definitions
 include directories (:command:`target_include_directories` and
 :command:`include_directories`).  See documentation of the
 :prop_tgt:`directory <COMPILE_OPTIONS>` and
-:prop_tgt:` target <COMPILE_OPTIONS>` ``COMPILE_OPTIONS`` properties.
+:prop_tgt:`target <COMPILE_OPTIONS>` ``COMPILE_OPTIONS`` properties.
 
 Arguments to ``add_compile_options`` may use "generator expressions" with
 the syntax ``$<...>``.  See the :manual:`cmake-generator-expressions(7)`

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0dffbb93def3bd7922da7bd38ba9f8d19c49da17
commit 0dffbb93def3bd7922da7bd38ba9f8d19c49da17
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 20 16:42:54 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 20 16:42:54 2014 +0200

    Features: Ensure that list exists to remove from.

diff --git a/Modules/CMakeDetermineCompileFeatures.cmake b/Modules/CMakeDetermineCompileFeatures.cmake
index 3762912..da68e94 100644
--- a/Modules/CMakeDetermineCompileFeatures.cmake
+++ b/Modules/CMakeDetermineCompileFeatures.cmake
@@ -67,7 +67,7 @@ function(cmake_determine_compile_features lang)
       return()
     endif()
 
-    if (CMAKE_CXX98_COMPILE_FEATURES)
+    if (CMAKE_CXX11_COMPILE_FEATURES AND CMAKE_CXX98_COMPILE_FEATURES)
       list(REMOVE_ITEM CMAKE_CXX11_COMPILE_FEATURES ${CMAKE_CXX98_COMPILE_FEATURES})
     endif()
 

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

Summary of changes:
 Help/command/add_compile_options.rst        |    2 +-
 Modules/CMakeDetermineCompileFeatures.cmake |    2 +-
 Source/cmTarget.cxx                         |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake