From 0dffbb93def3bd7922da7bd38ba9f8d19c49da17 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 20 May 2014 16:42:54 +0200 Subject: [PATCH 1/3] Features: Ensure that list exists to remove from. --- Modules/CMakeDetermineCompileFeatures.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/CMakeDetermineCompileFeatures.cmake b/Modules/CMakeDetermineCompileFeatures.cmake index 376291284..da68e94be 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() From 96eb97f89e1dc3cb843fb5f50c7d48dc9fa0516b Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 20 May 2014 16:44:06 +0200 Subject: [PATCH 2/3] Help: Fix whitespace in doc link. --- Help/command/add_compile_options.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Help/command/add_compile_options.rst b/Help/command/add_compile_options.rst index 5d71e1124..214f4bef3 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 ` and -:prop_tgt:` target ` ``COMPILE_OPTIONS`` properties. +:prop_tgt:`target ` ``COMPILE_OPTIONS`` properties. Arguments to ``add_compile_options`` may use "generator expressions" with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)` From d1035bd5a54a523061ccae707e6a0ff193b9de09 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 20 May 2014 16:45:29 +0200 Subject: [PATCH 3/3] cmTarget: Avoid copying container we don't need to copy. --- Source/cmTarget.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 86842a44a..786021e5e 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -1220,7 +1220,7 @@ void cmTarget::GetDirectLinkLibraries(const std::string& config, &dagChecker), libs); - std::set seenProps = cge->GetSeenTargetProperties(); + std::set const& seenProps = cge->GetSeenTargetProperties(); for (std::set::const_iterator it = seenProps.begin(); it != seenProps.end(); ++it) {