summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Source/cmIfCommand.cxx12
-rw-r--r--Source/cmIfCommand.h6
-rw-r--r--Source/cmIncludeCommand.cxx5
-rw-r--r--Source/cmIncludeDirectoryCommand.cxx6
-rw-r--r--Source/cmIncludeExternalMSProjectCommand.cxx8
-rw-r--r--Source/cmIncludeExternalMSProjectCommand.h6
-rw-r--r--Source/cmIncludeRegularExpressionCommand.cxx3
-rw-r--r--Source/cmIncludeRegularExpressionCommand.h3
-rw-r--r--Source/cmInstallCommand.h16
-rw-r--r--Source/cmInstallFilesCommand.cxx3
-rw-r--r--Source/cmInstallGenerator.cxx25
-rw-r--r--Source/cmInstallGenerator.h3
-rw-r--r--Source/cmInstallProgramsCommand.cxx6
-rw-r--r--Source/cmInstallProgramsCommand.h2
-rw-r--r--Source/cmInstallTargetGenerator.cxx25
-rw-r--r--Source/cmInstallTargetGenerator.h3
-rw-r--r--Source/cmInstallTargetsCommand.cxx6
17 files changed, 82 insertions, 56 deletions
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index b611796..4e7c777 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -55,7 +55,8 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf)
err += ". Did you mean ";
err += name;
err += "( ";
- for(std::vector<cmListFileArgument>::const_iterator a = this->Args.begin();
+ for(std::vector<cmListFileArgument>::const_iterator a =
+ this->Args.begin();
a != this->Args.end();++a)
{
err += (a->Quoted?"\"":"");
@@ -86,7 +87,8 @@ bool cmIfFunctionBlocker::ShouldRemove(const cmListFileFunction& lff,
void cmIfFunctionBlocker::
ScopeEnded(cmMakefile &mf)
{
- std::string errmsg = "The end of a CMakeLists file was reached with an IF statement that was not closed properly.\nWithin the directory: ";
+ std::string errmsg = "The end of a CMakeLists file was reached with an "
+ "IF statement that was not closed properly.\nWithin the directory: ";
errmsg += mf.GetCurrentDirectory();
errmsg += "\nThe arguments are: ";
for(std::vector<cmListFileArgument>::const_iterator j = this->Args.begin();
@@ -100,13 +102,15 @@ ScopeEnded(cmMakefile &mf)
cmSystemTools::Message(errmsg.c_str(), "Warning");
}
-bool cmIfCommand::InvokeInitialPass(const std::vector<cmListFileArgument>& args)
+bool cmIfCommand
+::InvokeInitialPass(const std::vector<cmListFileArgument>& args)
{
char* errorString = 0;
std::vector<std::string> expandedArguments;
this->Makefile->ExpandArguments(args, expandedArguments);
- bool isTrue = cmIfCommand::IsTrue(expandedArguments,&errorString,this->Makefile);
+ bool isTrue =
+ cmIfCommand::IsTrue(expandedArguments,&errorString,this->Makefile);
if (errorString)
{
diff --git a/Source/cmIfCommand.h b/Source/cmIfCommand.h
index 9e55762..a8a7b81 100644
--- a/Source/cmIfCommand.h
+++ b/Source/cmIfCommand.h
@@ -154,9 +154,9 @@ public:
"variable is true or false just if it has been set.";
}
- // this is a shared function for both If and Else to determine if
- // the arguments were valid, and if so, was the response true. If there is an
- // error, the errorString will be set.
+ // this is a shared function for both If and Else to determine if the
+ // arguments were valid, and if so, was the response true. If there is
+ // an error, the errorString will be set.
static bool IsTrue(const std::vector<std::string> &args,
char** errorString, const cmMakefile *mf);
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index d418698..5cab7d3 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -46,8 +46,9 @@ bool cmIncludeCommand::InitialPass(std::vector<std::string> const& args)
fname = mfile.c_str();
}
}
- bool readit = this->Makefile->ReadListFile( this->Makefile->GetCurrentListFile(),
- fname.c_str() );
+ bool readit =
+ this->Makefile->ReadListFile( this->Makefile->GetCurrentListFile(),
+ fname.c_str() );
if(!optional && !readit && !cmSystemTools::GetFatalErrorOccured())
{
std::string m = "Could not find include file: ";
diff --git a/Source/cmIncludeDirectoryCommand.cxx b/Source/cmIncludeDirectoryCommand.cxx
index eb07eb7..9dc2a25 100644
--- a/Source/cmIncludeDirectoryCommand.cxx
+++ b/Source/cmIncludeDirectoryCommand.cxx
@@ -17,7 +17,8 @@
#include "cmIncludeDirectoryCommand.h"
// cmIncludeDirectoryCommand
-bool cmIncludeDirectoryCommand::InitialPass(std::vector<std::string> const& args)
+bool cmIncludeDirectoryCommand
+::InitialPass(std::vector<std::string> const& args)
{
if(args.size() < 1 )
{
@@ -43,7 +44,8 @@ bool cmIncludeDirectoryCommand::InitialPass(std::vector<std::string> const& args
{
if(i->size() == 0)
{
- cmSystemTools::Error("Empty Include Directory Passed into INCLUDE_DIRECTORIES command.");
+ cmSystemTools::Error
+ ("Empty Include Directory Passed into INCLUDE_DIRECTORIES command.");
}
std::string unixPath = *i;
cmSystemTools::ConvertToUnixSlashes(unixPath);
diff --git a/Source/cmIncludeExternalMSProjectCommand.cxx b/Source/cmIncludeExternalMSProjectCommand.cxx
index 7a9248f..b5038fa 100644
--- a/Source/cmIncludeExternalMSProjectCommand.cxx
+++ b/Source/cmIncludeExternalMSProjectCommand.cxx
@@ -17,12 +17,14 @@
#include "cmIncludeExternalMSProjectCommand.h"
// cmIncludeExternalMSProjectCommand
-bool cmIncludeExternalMSProjectCommand::InitialPass(std::vector<std::string> const& args)
+bool cmIncludeExternalMSProjectCommand
+::InitialPass(std::vector<std::string> const& args)
{
if(args.size() < 2)
{
- this->SetError("INCLUDE_EXTERNAL_MSPROJECT called with incorrect number of arguments");
- return false;
+ this->SetError("INCLUDE_EXTERNAL_MSPROJECT called with incorrect "
+ "number of arguments");
+ return false;
}
// only compile this for win32 to avoid coverage errors
#ifdef _WIN32
diff --git a/Source/cmIncludeExternalMSProjectCommand.h b/Source/cmIncludeExternalMSProjectCommand.h
index 4e88e99..c597172 100644
--- a/Source/cmIncludeExternalMSProjectCommand.h
+++ b/Source/cmIncludeExternalMSProjectCommand.h
@@ -22,9 +22,9 @@
/** \class cmIncludeExternalMSProjectCommand
* \brief Specify an external MS project file for inclusion in the workspace.
*
- * cmIncludeExternalMSProjectCommand is used to specify an externally generated
- * Microsoft project file for inclusion in the default workspace generated by
- * CMake.
+ * cmIncludeExternalMSProjectCommand is used to specify an externally
+ * generated Microsoft project file for inclusion in the default workspace
+ * generated by CMake.
*/
class cmIncludeExternalMSProjectCommand : public cmCommand
{
diff --git a/Source/cmIncludeRegularExpressionCommand.cxx b/Source/cmIncludeRegularExpressionCommand.cxx
index 56c4e9b..f94b971 100644
--- a/Source/cmIncludeRegularExpressionCommand.cxx
+++ b/Source/cmIncludeRegularExpressionCommand.cxx
@@ -17,7 +17,8 @@
#include "cmIncludeRegularExpressionCommand.h"
// cmIncludeRegularExpressionCommand
-bool cmIncludeRegularExpressionCommand::InitialPass(std::vector<std::string> const& args)
+bool cmIncludeRegularExpressionCommand
+::InitialPass(std::vector<std::string> const& args)
{
if((args.size() < 1) || (args.size() > 2))
{
diff --git a/Source/cmIncludeRegularExpressionCommand.h b/Source/cmIncludeRegularExpressionCommand.h
index f7fc412..7b31dc8 100644
--- a/Source/cmIncludeRegularExpressionCommand.h
+++ b/Source/cmIncludeRegularExpressionCommand.h
@@ -65,7 +65,8 @@ public:
" INCLUDE_REGULAR_EXPRESSION(regex_match [regex_complain])\n"
"Set the regular expressions used in dependency checking. Only files "
"matching regex_match will be traced as dependencies. Only files "
- "matching regex_complain will generate warnings if they cannot be found "
+ "matching regex_complain will generate warnings if they cannot be "
+ "found "
"(standard header paths are not searched). The defaults are:\n"
" regex_match = \"^.*$\" (match everything)\n"
" regex_complain = \"^$\" (match empty string only)";
diff --git a/Source/cmInstallCommand.h b/Source/cmInstallCommand.h
index f325f06..508fc09 100644
--- a/Source/cmInstallCommand.h
+++ b/Source/cmInstallCommand.h
@@ -108,13 +108,15 @@ public:
"Executables are always treated as runtime targets. "
"Static libraries are always treated as archive targets. "
"Module libraries are always treated as library targets. "
- "For non-DLL platforms shared libraries are treated as library targets. "
+ "For non-DLL platforms shared libraries are treated as library "
+ "targets. "
"For DLL platforms the DLL part of a shared library is treated as "
"a runtime target and the corresponding import library is treated as "
"an archive target. "
"All Windows-based systems including Cygwin are DLL platforms. "
"The ARCHIVE, LIBRARY, and RUNTIME "
- "arguments change the type of target to which the subsequent properties "
+ "arguments change the type of target to which the subsequent "
+ "properties "
"apply. If none is given the installation properties apply to "
"all target types. If only one is given then only targets of that "
"type will be installed (which can be used to install just a DLL or "
@@ -131,12 +133,12 @@ public:
" INSTALL(TARGETS mySharedLib DESTINATION /some/full/path)\n"
"will install myExe to <prefix>/bin and myStaticLib to "
"<prefix>/lib/static. "
- "On non-DLL platforms mySharedLib will be installed to <prefix>/lib and "
- "/some/full/path. On DLL platforms the mySharedLib DLL will be "
+ "On non-DLL platforms mySharedLib will be installed to <prefix>/lib "
+ "and /some/full/path. On DLL platforms the mySharedLib DLL will be "
"installed to <prefix>/bin and /some/full/path and its import library "
"will be installed to <prefix>/lib/static and /some/full/path. "
- "On non-DLL platforms mySharedLib will be installed to <prefix>/lib and "
- "/some/full/path."
+ "On non-DLL platforms mySharedLib will be installed to <prefix>/lib "
+ "and /some/full/path."
"\n"
"The FILES signature:\n"
" INSTALL(FILES files... DESTINATION <dir>\n"
@@ -169,7 +171,7 @@ public:
"installation. If the script file name is a relative path "
"it will be interpreted with respect to the current source directory. "
"The CODE form will invoke the given CMake code during installation. "
- "Code is specified as a single argument inside a double-quoted string. "
+ "Code is specified as a single argument inside a double-quoted string. "
"For example, the code\n"
" INSTALL(CODE \"MESSAGE(\\\"Sample install message.\\\")\")\n"
"will print a message during installation.\n"
diff --git a/Source/cmInstallFilesCommand.cxx b/Source/cmInstallFilesCommand.cxx
index b78a7ce..5b75456 100644
--- a/Source/cmInstallFilesCommand.cxx
+++ b/Source/cmInstallFilesCommand.cxx
@@ -17,7 +17,8 @@
#include "cmInstallFilesCommand.h"
// cmExecutableCommand
-bool cmInstallFilesCommand::InitialPass(std::vector<std::string> const& argsIn)
+bool cmInstallFilesCommand
+::InitialPass(std::vector<std::string> const& argsIn)
{
if(argsIn.size() < 2)
{
diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx
index 797fc02..afbc68a 100644
--- a/Source/cmInstallGenerator.cxx
+++ b/Source/cmInstallGenerator.cxx
@@ -47,18 +47,19 @@ cmInstallGenerator
}
//----------------------------------------------------------------------------
-void cmInstallGenerator::AddInstallRule(
- std::ostream& os,
- const char* dest,
- int type,
- const char* file,
- bool optional /* = false */,
- const char* properties /* = 0 */,
- const char* permissions /* = 0 */,
- std::vector<std::string> const& configurations /* = std::vector<std::string>() */,
- const char* component /* = 0 */,
- const char* rename /* = 0 */
- )
+void cmInstallGenerator
+::AddInstallRule(
+ std::ostream& os,
+ const char* dest,
+ int type,
+ const char* file,
+ bool optional /* = false */,
+ const char* properties /* = 0 */,
+ const char* permissions /* = 0 */,
+ std::vector<std::string> const& configurations,
+ const char* component /* = 0 */,
+ const char* rename /* = 0 */
+ )
{
// Use the FILE command to install the file.
std::string stype;
diff --git a/Source/cmInstallGenerator.h b/Source/cmInstallGenerator.h
index 017c63a..53c8c43 100644
--- a/Source/cmInstallGenerator.h
+++ b/Source/cmInstallGenerator.h
@@ -39,7 +39,8 @@ public:
const char* file, bool optional = false,
const char* properties = 0,
const char* permissions = 0,
- std::vector<std::string> const& configurations =std::vector<std::string>(),
+ std::vector<std::string> const& configurations
+ = std::vector<std::string>(),
const char* component = 0,
const char* rename = 0
);
diff --git a/Source/cmInstallProgramsCommand.cxx b/Source/cmInstallProgramsCommand.cxx
index 3a72810..1830c5e 100644
--- a/Source/cmInstallProgramsCommand.cxx
+++ b/Source/cmInstallProgramsCommand.cxx
@@ -17,7 +17,8 @@
#include "cmInstallProgramsCommand.h"
// cmExecutableCommand
-bool cmInstallProgramsCommand::InitialPass(std::vector<std::string> const& args)
+bool cmInstallProgramsCommand
+::InitialPass(std::vector<std::string> const& args)
{
if(args.size() < 2)
{
@@ -89,7 +90,8 @@ void cmInstallProgramsCommand::FinalPass()
* present in the build tree. If a full path is given, it is just
* returned.
*/
-std::string cmInstallProgramsCommand::FindInstallSource(const char* name) const
+std::string cmInstallProgramsCommand
+::FindInstallSource(const char* name) const
{
if(cmSystemTools::FileIsFullPath(name))
{
diff --git a/Source/cmInstallProgramsCommand.h b/Source/cmInstallProgramsCommand.h
index c960f89..2cd6d1e 100644
--- a/Source/cmInstallProgramsCommand.h
+++ b/Source/cmInstallProgramsCommand.h
@@ -76,7 +76,7 @@ public:
"using the GLOB form of the FILE command.\n"
" INSTALL_PROGRAMS(<dir> file1 file2 [file3 ...])\n"
" INSTALL_PROGRAMS(<dir> FILES file1 [file2 ...])\n"
- "Create rules to install the listed programs into the given directory. "
+ "Create rules to install the listed programs into the given directory. "
"Use the FILES argument to guarantee that the file list version of "
"the command will be used even when there is only one argument.\n"
" INSTALL_PROGRAMS(<dir> regexp)\n"
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index b5cf240..ef5bb43 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -268,8 +268,9 @@ std::string cmInstallTargetGenerator::GetScriptReference(cmTarget* target,
}
//----------------------------------------------------------------------------
-void cmInstallTargetGenerator::AddInstallNamePatchRule(std::ostream& os,
- const char* destination)
+void cmInstallTargetGenerator
+::AddInstallNamePatchRule(std::ostream& os,
+ const char* destination)
{
// Build a map of build-tree install_name to install-tree install_name for
// shared libraries linked to this target.
@@ -291,13 +292,15 @@ void cmInstallTargetGenerator::AddInstallNamePatchRule(std::ostream& os,
lib != this->Target->GetName()) &&
(j->second == cmTarget::GENERAL || j->second == linkType))
{
- if(cmTarget* tgt = this->Target->GetMakefile()->GetLocalGenerator()->GetGlobalGenerator()->FindTarget(0, lib.c_str()))
+ if(cmTarget* tgt = this->Target->GetMakefile()->
+ GetLocalGenerator()->GetGlobalGenerator()->
+ FindTarget(0, lib.c_str()))
{
if(tgt->GetType() == cmTarget::SHARED_LIBRARY)
{
- // If the build tree and install tree use different path components
- // of the install_name field then we need to create a mapping to be
- // applied after installation.
+ // If the build tree and install tree use different path
+ // components of the install_name field then we need to create a
+ // mapping to be applied after installation.
std::string for_build = tgt->GetInstallNameDirForBuildTree(config);
std::string for_install =
tgt->GetInstallNameDirForInstallTree(config);
@@ -326,8 +329,10 @@ void cmInstallTargetGenerator::AddInstallNamePatchRule(std::ostream& os,
std::string new_id;
if(this->Target->GetType() == cmTarget::SHARED_LIBRARY)
{
- std::string for_build = this->Target->GetInstallNameDirForBuildTree(config);
- std::string for_install = this->Target->GetInstallNameDirForInstallTree(config);
+ std::string for_build =
+ this->Target->GetInstallNameDirForBuildTree(config);
+ std::string for_install =
+ this->Target->GetInstallNameDirForInstallTree(config);
if(for_build != for_install)
{
// Prepare to refer to the install-tree install_name.
@@ -340,8 +345,8 @@ void cmInstallTargetGenerator::AddInstallNamePatchRule(std::ostream& os,
// install_name value and references.
if(!new_id.empty() || !install_name_remap.empty())
{
- std::string component_test =
- "NOT CMAKE_INSTALL_COMPONENT OR \"${CMAKE_INSTALL_COMPONENT}\" MATCHES \"^(";
+ std::string component_test = "NOT CMAKE_INSTALL_COMPONENT OR "
+ "\"${CMAKE_INSTALL_COMPONENT}\" MATCHES \"^(";
component_test += this->Component;
component_test += ")$\"";
os << "IF(" << component_test << ")\n";
diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h
index 777b7af..693a908 100644
--- a/Source/cmInstallTargetGenerator.h
+++ b/Source/cmInstallTargetGenerator.h
@@ -30,7 +30,8 @@ public:
cmInstallTargetGenerator(
cmTarget& t, const char* dest, bool implib,
const char* permissions = "",
- std::vector<std::string> const& configurations =std::vector<std::string>(),
+ std::vector<std::string> const& configurations
+ = std::vector<std::string>(),
const char* component = ""
);
virtual ~cmInstallTargetGenerator();
diff --git a/Source/cmInstallTargetsCommand.cxx b/Source/cmInstallTargetsCommand.cxx
index 5a16d58..42f83ac 100644
--- a/Source/cmInstallTargetsCommand.cxx
+++ b/Source/cmInstallTargetsCommand.cxx
@@ -17,7 +17,8 @@
#include "cmInstallTargetsCommand.h"
// cmExecutableCommand
-bool cmInstallTargetsCommand::InitialPass(std::vector<std::string> const& args)
+bool cmInstallTargetsCommand
+::InitialPass(std::vector<std::string> const& args)
{
if(args.size() < 2 )
{
@@ -36,7 +37,8 @@ bool cmInstallTargetsCommand::InitialPass(std::vector<std::string> const& args)
++s;
if ( s == args.end() )
{
- this->SetError("called with RUNTIME_DIRECTORY but no actual directory");
+ this->SetError("called with RUNTIME_DIRECTORY but no actual "
+ "directory");
return false;
}
generated by cgit v0.12 at 2024-12-29 04:17:25 (GMT)