[cmake-commits] king committed cmGlobalXCodeGenerator.cxx 1.159.2.1
1.159.2.2 cmLocalGenerator.cxx 1.227.2.1 1.227.2.2
cmLocalVisualStudio7Generator.cxx 1.194.2.2 1.194.2.3
cmMakeDepend.cxx 1.44.10.1 1.44.10.2
cmMakefileLibraryTargetGenerator.cxx 1.42.2.1 1.42.2.2
cmSourceFile.cxx 1.35.8.2 1.35.8.3 cmSourceFile.h 1.21.2.2 1.21.2.3
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Jun 13 15:32:27 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv15131
Modified Files:
Tag: CMake-SourceFile2-b
cmGlobalXCodeGenerator.cxx cmLocalGenerator.cxx
cmLocalVisualStudio7Generator.cxx cmMakeDepend.cxx
cmMakefileLibraryTargetGenerator.cxx cmSourceFile.cxx
cmSourceFile.h
Log Message:
ENH: Changed signature of cmSourceFile::GetFullPath() back to returning a reference to a string.
Index: cmMakefileLibraryTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileLibraryTargetGenerator.cxx,v
retrieving revision 1.42.2.1
retrieving revision 1.42.2.2
diff -u -d -r1.42.2.1 -r1.42.2.2
--- cmMakefileLibraryTargetGenerator.cxx 11 Jun 2007 22:23:34 -0000 1.42.2.1
+++ cmMakefileLibraryTargetGenerator.cxx 13 Jun 2007 19:32:24 -0000 1.42.2.2
@@ -154,7 +154,7 @@
extraFlags +=
this->Makefile->GetSafeDefinition("CMAKE_LINK_DEF_FILE_FLAG");
extraFlags +=
- this->Convert(sf->GetFullPath(),
+ this->Convert(sf->GetFullPath().c_str(),
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::SHELL);
}
Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.194.2.2
retrieving revision 1.194.2.3
diff -u -d -r1.194.2.2 -r1.194.2.3
--- cmLocalVisualStudio7Generator.cxx 13 Jun 2007 17:44:38 -0000 1.194.2.2
+++ cmLocalVisualStudio7Generator.cxx 13 Jun 2007 19:32:24 -0000 1.194.2.3
@@ -887,7 +887,7 @@
if(cmSystemTools::UpperCase(sf->GetExtension()) == "DEF")
{
fout << "\t\t\t\tModuleDefinitionFile=\""
- << this->ConvertToXMLOutputPath(sf->GetFullPath())
+ << this->ConvertToXMLOutputPath(sf->GetFullPath().c_str())
<< "\"\n";
return;
}
Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.159.2.1
retrieving revision 1.159.2.2
diff -u -d -r1.159.2.1 -r1.159.2.2
--- cmGlobalXCodeGenerator.cxx 13 Jun 2007 19:21:03 -0000 1.159.2.1
+++ cmGlobalXCodeGenerator.cxx 13 Jun 2007 19:32:24 -0000 1.159.2.2
@@ -497,10 +497,10 @@
fileRef->AddAttribute("lastKnownFileType",
this->CreateString(sourcecode.c_str()));
std::string path =
- this->ConvertToRelativeForXCode(sf->GetFullPath());
+ this->ConvertToRelativeForXCode(sf->GetFullPath().c_str());
std::string dir;
std::string file;
- cmSystemTools::SplitProgramPath(sf->GetFullPath(),
+ cmSystemTools::SplitProgramPath(sf->GetFullPath().c_str(),
dir, file);
fileRef->AddAttribute("name", this->CreateString(file.c_str()));
Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.227.2.1
retrieving revision 1.227.2.2
diff -u -d -r1.227.2.1 -r1.227.2.2
--- cmLocalGenerator.cxx 11 Jun 2007 22:23:34 -0000 1.227.2.1
+++ cmLocalGenerator.cxx 13 Jun 2007 19:32:24 -0000 1.227.2.2
@@ -549,7 +549,7 @@
objectDir = this->Convert(objectDir.c_str(),START_OUTPUT,SHELL);
std::string objectFile = this->Convert(ofname,START_OUTPUT,SHELL);
std::string sourceFile =
- this->Convert(source.GetFullPath(),START_OUTPUT,SHELL,true);
+ this->Convert(source.GetFullPath().c_str(),START_OUTPUT,SHELL,true);
std::string varString = "CMAKE_";
varString += lang;
varString += "_COMPILE_OBJECT";
@@ -610,7 +610,7 @@
this->Makefile->AddCustomCommandToOutput(
ofname,
depends,
- source.GetFullPath(),
+ source.GetFullPath().c_str(),
commandLines,
comment.c_str(),
this->Makefile->GetStartOutputDirectory()
@@ -1366,7 +1366,7 @@
{
linkFlags +=
this->Makefile->GetSafeDefinition("CMAKE_LINK_DEF_FILE_FLAG");
- linkFlags += this->Convert(sf->GetFullPath(),
+ linkFlags += this->Convert(sf->GetFullPath().c_str(),
START_OUTPUT, SHELL);
linkFlags += " ";
}
@@ -2629,7 +2629,7 @@
{
// Construct the object file name using the full path to the source
// file which is its only unique identification.
- const char* fullPath = source.GetFullPath();
+ const char* fullPath = source.GetFullPath().c_str();
// Try referencing the source relative to the source tree.
std::string relFromSource = this->Convert(fullPath, START);
Index: cmSourceFile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSourceFile.cxx,v
retrieving revision 1.35.8.2
retrieving revision 1.35.8.3
diff -u -d -r1.35.8.2 -r1.35.8.3
--- cmSourceFile.cxx 13 Jun 2007 19:20:35 -0000 1.35.8.2
+++ cmSourceFile.cxx 13 Jun 2007 19:32:24 -0000 1.35.8.3
@@ -53,8 +53,9 @@
{
this->Language = lang;
}
- else if(this->GetFullPath()[0])
+ else
{
+ this->GetFullPath();
cmLocalGenerator* lg =
this->Location.GetMakefile()->GetLocalGenerator();
cmGlobalGenerator* gg = lg->GetGlobalGenerator();
@@ -75,7 +76,7 @@
}
//----------------------------------------------------------------------------
-const char* cmSourceFile::GetFullPath() const
+std::string const& cmSourceFile::GetFullPath() const
{
if(this->FullPath.empty())
{
@@ -85,7 +86,7 @@
self->CheckExtension();
}
}
- return this->FullPath.c_str();
+ return this->FullPath;
}
//----------------------------------------------------------------------------
@@ -245,7 +246,7 @@
// properties or variables, always recompute them
if (!strcmp(prop,"LOCATION"))
{
- return this->GetFullPath();
+ return this->GetFullPath().c_str();
}
bool chain = false;
Index: cmSourceFile.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSourceFile.h,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -d -r1.21.2.2 -r1.21.2.3
--- cmSourceFile.h 13 Jun 2007 19:21:52 -0000 1.21.2.2
+++ cmSourceFile.h 13 Jun 2007 19:32:24 -0000 1.21.2.3
@@ -55,7 +55,7 @@
/**
* The full path to the file.
*/
- const char* GetFullPath() const;
+ std::string const& GetFullPath() const;
/**
* Get the file extension of this source file.
Index: cmMakeDepend.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakeDepend.cxx,v
retrieving revision 1.44.10.1
retrieving revision 1.44.10.2
diff -u -d -r1.44.10.1 -r1.44.10.2
--- cmMakeDepend.cxx 11 Jun 2007 22:23:34 -0000 1.44.10.1
+++ cmMakeDepend.cxx 13 Jun 2007 19:32:24 -0000 1.44.10.2
@@ -278,7 +278,7 @@
if(!(*i)->GetPropertyAsBool("HEADER_FILE_ONLY"))
{
cmDependInformation* info =
- this->GetDependInformation((*i)->GetFullPath(),0);
+ this->GetDependInformation((*i)->GetFullPath().c_str(),0);
this->AddFileToSearchPath(info->FullPath.c_str());
info->SourceFile = *i;
this->GenerateDependInformation(info);
More information about the Cmake-commits
mailing list