From 317d8498aa02c9f486bf5071963bb2034777cdd6 Mon Sep 17 00:00:00 2001
From: Kevin Funk <kfunk@kde.org>
Date: Mon, 17 Feb 2014 11:02:28 +0100
Subject: Small typo fix
---
Source/cmQtAutoGenerators.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index ab194c3..dfb310e 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1512,7 +1512,7 @@ void cmQtAutoGenerators::ParseCppFile(const std::string& absFilename,
}
else
{
- std::cerr << "AUTOGEN: error: " << absFilename << " The file "
+ std::cerr << "AUTOGEN: error: " << absFilename << ": The file "
<< "includes the moc file \"" << currentMoc << "\", "
<< "but could not find header \"" << basename
<< '{' << this->Join(headerExtensions, ',') << "}\" ";
--
cgit v0.12
From a74d125a7c67b7e4de9bd707b8c2a6d669a34fec Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Mon, 17 Feb 2014 11:07:59 +0100
Subject: Help: Fix typo
binary_find -> binary_search.
---
Help/manual/cmake-developer.7.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index 887047c..376b56c 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -84,7 +84,7 @@ In some implementations, algorithms operating on iterators to a container of
const char* dir = /*...*/;
std::vector<std::string> vec;
// ...
- std::binary_find(vec.begin(), vec.end(), dir); // Wrong
+ std::binary_search(vec.begin(), vec.end(), dir); // Wrong
The ``std::string`` may need to be explicitly constructed:
@@ -93,7 +93,7 @@ The ``std::string`` may need to be explicitly constructed:
const char* dir = /*...*/;
std::vector<std::string> vec;
// ...
- std::binary_find(vec.begin(), vec.end(), std::string(dir)); // Ok
+ std::binary_search(vec.begin(), vec.end(), std::string(dir)); // Ok
std::auto_ptr
-------------
--
cgit v0.12
From 907c09cd312e60d10f7af9342ad88e550af5e36c Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Mon, 17 Feb 2014 11:08:58 +0100
Subject: include_directory: Add missing include.
The cmGeneratorExpression is used here, but the header for it is not
in the include heirarchy. This would be a compile error if the file
were compiled as a standalone translation unit, but it is instead
used in a mini-unity-build by inclusion in cmCommands.cxx. The header
for cmGeneratorExpression happens to be included first, so the
compilation works fine.
IDEs do not know this however, and flag the use as an error.
---
Source/cmTargetIncludeDirectoriesCommand.cxx | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Source/cmTargetIncludeDirectoriesCommand.cxx b/Source/cmTargetIncludeDirectoriesCommand.cxx
index 913bdab..f8e1188 100644
--- a/Source/cmTargetIncludeDirectoriesCommand.cxx
+++ b/Source/cmTargetIncludeDirectoriesCommand.cxx
@@ -11,6 +11,8 @@
============================================================================*/
#include "cmTargetIncludeDirectoriesCommand.h"
+#include "cmGeneratorExpression.h"
+
//----------------------------------------------------------------------------
bool cmTargetIncludeDirectoriesCommand
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
--
cgit v0.12
From 5e0c73c78c8e0f2fdf23c1e04b14cb656a065811 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Mon, 17 Feb 2014 11:13:44 +0100
Subject: cmGlobalGenerator: Remove unused variable.
---
Source/cmGlobalGenerator.cxx | 1 -
1 file changed, 1 deletion(-)
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a61cab1..7d98734 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2911,7 +2911,6 @@ void cmGlobalGenerator::WriteSummary()
cmGeneratedFileStream fout(fname.c_str());
// Generate summary information files for each target.
- std::string dir;
for(std::map<cmStdString,cmTarget *>::const_iterator ti =
this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti)
{
--
cgit v0.12
From c0ea4c5c6f79a0e0a808f79abeea4464d05dae03 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Mon, 17 Feb 2014 11:14:18 +0100
Subject: Makefile: Fix comment indentation.
---
Source/cmMakefileTargetGenerator.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 7f90078..c3ca85d 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -344,7 +344,7 @@ void cmMakefileTargetGenerator::WriteTargetLanguageFlags()
// write language flags for target
std::set<cmStdString> languages;
this->Target->GetLanguages(languages);
- // put the compiler in the rules.make file so that if it changes
+ // put the compiler in the rules.make file so that if it changes
// things rebuild
for(std::set<cmStdString>::const_iterator l = languages.begin();
l != languages.end(); ++l)
--
cgit v0.12
From f6cae4ea06501827c3f4e5907fdb83d5d61f545b Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Mon, 17 Feb 2014 18:54:53 +0100
Subject: Tests: Remove some trailing black lines.
---
Tests/SystemInformation/CMakeLists.txt | 2 --
1 file changed, 2 deletions(-)
diff --git a/Tests/SystemInformation/CMakeLists.txt b/Tests/SystemInformation/CMakeLists.txt
index 838fd4a..c33380f 100644
--- a/Tests/SystemInformation/CMakeLists.txt
+++ b/Tests/SystemInformation/CMakeLists.txt
@@ -57,5 +57,3 @@ endforeach()
get_directory_property(res INCLUDE_REGULAR_EXPRESSION)
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/OtherProperties.txt
"INCLUDE_REGULAR_EXPRESSION: ${res}\n")
-
-
--
cgit v0.12