[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2720-g414a447
Robert Maynard
robert.maynard at kitware.com
Mon Jun 24 11:05:47 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 414a447c14b02e00b3917b3f09033236605524ec (commit)
via 6dbd4a5f17db42d12cdddcdacf5f9bd4d67951d6 (commit)
from c94a4c5d5fe6a06c317e9a65ba64876a737dd7c8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=414a447c14b02e00b3917b3f09033236605524ec
commit 414a447c14b02e00b3917b3f09033236605524ec
Merge: c94a4c5 6dbd4a5
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Jun 24 11:05:43 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 24 11:05:43 2013 -0400
Merge topic 'makefile_AddCMakeOutputFile_signature' into next
6dbd4a5 cmMakefile: Refactor AddCMakeDependFile and AddCMakeOutputFile.
diff --cc Source/cmMakefile.cxx
index a6d61e5,d5d99a0..f3a66ba
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@@ -3369,9 -3369,8 +3369,9 @@@ int cmMakefile::ConfigureFile(const cha
}
std::string soutfile = outfile;
std::string sinfile = infile;
- this->AddCMakeDependFile(infile);
+ this->AddCMakeDependFile(sinfile);
cmSystemTools::ConvertToUnixSlashes(soutfile);
+ this->AddCMakeOutputFile(soutfile);
mode_t perm = 0;
cmSystemTools::GetPermissions(sinfile.c_str(), perm);
std::string::size_type pos = soutfile.rfind('/');
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6dbd4a5f17db42d12cdddcdacf5f9bd4d67951d6
commit 6dbd4a5f17db42d12cdddcdacf5f9bd4d67951d6
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Jun 18 13:41:50 2013 -0400
Commit: Robert Maynard <robert.maynard at kitware.com>
CommitDate: Mon Jun 24 10:43:20 2013 -0400
cmMakefile: Refactor AddCMakeDependFile and AddCMakeOutputFile.
AddCMakeDependFile and AddCMakeOutputFile both store as std::string
and all calling sites use std::string. So instead of creating more
temporary objects, lets just use std::strings.
diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index b43a7a7..860417f 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -396,7 +396,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
// Add dependencies on any non-temporary sources.
if(si->find("CMakeTmp") == si->npos)
{
- this->Makefile->AddCMakeDependFile(si->c_str());
+ this->Makefile->AddCMakeDependFile(*si);
}
}
fprintf(fout, ")\n");
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7d58d68..d5d99a0 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3369,7 +3369,7 @@ int cmMakefile::ConfigureFile(const char* infile, const char* outfile,
}
std::string soutfile = outfile;
std::string sinfile = infile;
- this->AddCMakeDependFile(infile);
+ this->AddCMakeDependFile(sinfile);
cmSystemTools::ConvertToUnixSlashes(soutfile);
mode_t perm = 0;
cmSystemTools::GetPermissions(sinfile.c_str(), perm);
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 0a87752..4297155 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -648,7 +648,7 @@ public:
const std::vector<std::string>& GetListFiles() const
{ return this->ListFiles; }
///! When the file changes cmake will be re-run from the build system.
- void AddCMakeDependFile(const char* file)
+ void AddCMakeDependFile(const std::string& file)
{ this->ListFiles.push_back(file);}
/**
@@ -666,7 +666,7 @@ public:
*/
const std::vector<std::string>& GetOutputFiles() const
{ return this->OutputFiles; }
- void AddCMakeOutputFile(const char* file)
+ void AddCMakeOutputFile(const std::string& file)
{ this->OutputFiles.push_back(file);}
/**
diff --git a/Source/cmOSXBundleGenerator.cxx b/Source/cmOSXBundleGenerator.cxx
index d3cdf85..a475c7c 100644
--- a/Source/cmOSXBundleGenerator.cxx
+++ b/Source/cmOSXBundleGenerator.cxx
@@ -49,7 +49,7 @@ void cmOSXBundleGenerator::CreateAppBundle(const std::string& targetName,
out += "/";
out += this->Target->GetAppBundleDirectory(this->ConfigName, false);
cmSystemTools::MakeDirectory(out.c_str());
- this->Makefile->AddCMakeOutputFile(out.c_str());
+ this->Makefile->AddCMakeOutputFile(out);
std::string newoutpath = out;
@@ -62,7 +62,7 @@ void cmOSXBundleGenerator::CreateAppBundle(const std::string& targetName,
this->LocalGenerator->GenerateAppleInfoPList(this->Target,
targetName.c_str(),
plist.c_str());
- this->Makefile->AddCMakeOutputFile(plist.c_str());
+ this->Makefile->AddCMakeOutputFile(plist);
outpath = newoutpath;
}
@@ -114,7 +114,7 @@ void cmOSXBundleGenerator::CreateFramework(
newName += "/Current";
cmSystemTools::RemoveFile(newName.c_str());
cmSystemTools::CreateSymlink(oldName.c_str(), newName.c_str());
- this->Makefile->AddCMakeOutputFile(newName.c_str());
+ this->Makefile->AddCMakeOutputFile(newName);
// foo -> Versions/Current/foo
oldName = "Versions/Current/";
@@ -123,7 +123,7 @@ void cmOSXBundleGenerator::CreateFramework(
newName += name;
cmSystemTools::RemoveFile(newName.c_str());
cmSystemTools::CreateSymlink(oldName.c_str(), newName.c_str());
- this->Makefile->AddCMakeOutputFile(newName.c_str());
+ this->Makefile->AddCMakeOutputFile(newName);
// Resources -> Versions/Current/Resources
if(this->MacContentFolders->find("Resources") !=
@@ -134,7 +134,7 @@ void cmOSXBundleGenerator::CreateFramework(
newName += "Resources";
cmSystemTools::RemoveFile(newName.c_str());
cmSystemTools::CreateSymlink(oldName.c_str(), newName.c_str());
- this->Makefile->AddCMakeOutputFile(newName.c_str());
+ this->Makefile->AddCMakeOutputFile(newName);
}
// Headers -> Versions/Current/Headers
@@ -146,7 +146,7 @@ void cmOSXBundleGenerator::CreateFramework(
newName += "Headers";
cmSystemTools::RemoveFile(newName.c_str());
cmSystemTools::CreateSymlink(oldName.c_str(), newName.c_str());
- this->Makefile->AddCMakeOutputFile(newName.c_str());
+ this->Makefile->AddCMakeOutputFile(newName);
}
// PrivateHeaders -> Versions/Current/PrivateHeaders
@@ -158,7 +158,7 @@ void cmOSXBundleGenerator::CreateFramework(
newName += "PrivateHeaders";
cmSystemTools::RemoveFile(newName.c_str());
cmSystemTools::CreateSymlink(oldName.c_str(), newName.c_str());
- this->Makefile->AddCMakeOutputFile(newName.c_str());
+ this->Makefile->AddCMakeOutputFile(newName);
}
}
@@ -174,7 +174,7 @@ void cmOSXBundleGenerator::CreateCFBundle(const std::string& targetName,
out += "/";
out += this->Target->GetCFBundleDirectory(this->ConfigName, false);
cmSystemTools::MakeDirectory(out.c_str());
- this->Makefile->AddCMakeOutputFile(out.c_str());
+ this->Makefile->AddCMakeOutputFile(out);
// Configure the Info.plist file. Note that it needs the executable name
// to be set.
@@ -184,7 +184,7 @@ void cmOSXBundleGenerator::CreateCFBundle(const std::string& targetName,
this->LocalGenerator->GenerateAppleInfoPList(this->Target,
targetName.c_str(),
plist.c_str());
- this->Makefile->AddCMakeOutputFile(plist.c_str());
+ this->Makefile->AddCMakeOutputFile(plist);
}
//----------------------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefile.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list