mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-01 20:00:51 -05:00
Merge topic 'minor-cleanups'
d1035bd5cmTarget: Avoid copying container we don't need to copy.96eb97f8Help: Fix whitespace in doc link.0dffbb93Features: Ensure that list exists to remove from.
This commit is contained in:
@@ -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)`
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
+1
-1
@@ -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)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user