diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-21 14:31:47 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-05-21 14:31:47 (GMT) |
| commit | 8dc8878a5e6388e0d08eb18d7cf631638cc49adb (patch) | |
| tree | 9b4e1a4efbf71aa64c3cf04db1db7b6e9d95f60c | |
| parent | f7654a07d5156c5f2899884949108dbe815563ce (diff) | |
| parent | d1035bd5a54a523061ccae707e6a0ff193b9de09 (diff) | |
| download | CMake-8dc8878a5e6388e0d08eb18d7cf631638cc49adb.zip CMake-8dc8878a5e6388e0d08eb18d7cf631638cc49adb.tar.gz CMake-8dc8878a5e6388e0d08eb18d7cf631638cc49adb.tar.bz2 | |
Merge topic 'minor-cleanups'
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.
| -rw-r--r-- | Help/command/add_compile_options.rst | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineCompileFeatures.cmake | 2 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
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)` 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() 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) { |