kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'minor-cleanups'

Browse Source 
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.
This commit is contained in:
Brad King 2014-05-21 10:31:47 -04:00 committed by CMake Topic Stage
commit 8dc8878a5e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Help/command/add_compile_options.rst
View File

@ -14,7 +14,7 @@ alternative commands exist to add preprocessor definitions
include directories (:command:`target_include_directories` and include directories (:command:`target_include_directories` and
:command:`include_directories`). See documentation of the :command:`include_directories`). See documentation of the
:prop_tgt:`directory <COMPILE_OPTIONS>` and :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 Arguments to ``add_compile_options`` may use "generator expressions" with
the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)` the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)`

2
Modules/CMakeDetermineCompileFeatures.cmake
View File

@ -67,7 +67,7 @@ function(cmake_determine_compile_features lang)
return() return()
endif() 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}) list(REMOVE_ITEM CMAKE_CXX11_COMPILE_FEATURES ${CMAKE_CXX98_COMPILE_FEATURES})
endif() endif()

2
Source/cmTarget.cxx
View File

@ -1220,7 +1220,7 @@ void cmTarget::GetDirectLinkLibraries(const std::string& config,
&dagChecker), &dagChecker),
libs); 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(); for (std::set<std::string>::const_iterator it = seenProps.begin();
it != seenProps.end(); ++it) it != seenProps.end(); ++it)
{ {