[Cmake-commits] [cmake-commits] king committed cmConfigureFileCommand.cxx 1.34 1.35 cmConfigureFileCommand.h 1.24 1.25
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Sep 16 15:09:21 EDT 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv4336/Source
Modified Files:
cmConfigureFileCommand.cxx cmConfigureFileCommand.h
Log Message:
Fix typo in cmConfigureFileCommand ivar name
Rename 'OuputFile' to 'OutputFile'.
Index: cmConfigureFileCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmConfigureFileCommand.cxx,v
retrieving revision 1.34
retrieving revision 1.35
diff -C 2 -d -r1.34 -r1.35
*** cmConfigureFileCommand.cxx 7 Mar 2008 20:30:33 -0000 1.34
--- cmConfigureFileCommand.cxx 16 Sep 2009 19:09:19 -0000 1.35
***************
*** 29,36 ****
}
this->InputFile = args[0];
! this->OuputFile = args[1];
! if ( !this->Makefile->CanIWriteThisFile(this->OuputFile.c_str()) )
{
! std::string e = "attempted to configure a file: " + this->OuputFile
+ " into a source directory.";
this->SetError(e.c_str());
--- 29,36 ----
}
this->InputFile = args[0];
! this->OutputFile = args[1];
! if ( !this->Makefile->CanIWriteThisFile(this->OutputFile.c_str()) )
{
! std::string e = "attempted to configure a file: " + this->OutputFile
+ " into a source directory.";
this->SetError(e.c_str());
***************
*** 98,102 ****
}
return this->Makefile->ConfigureFile(inFile.c_str(),
! this->OuputFile.c_str(),
this->CopyOnly,
this->AtOnly,
--- 98,102 ----
}
return this->Makefile->ConfigureFile(inFile.c_str(),
! this->OutputFile.c_str(),
this->CopyOnly,
this->AtOnly,
Index: cmConfigureFileCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmConfigureFileCommand.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** cmConfigureFileCommand.h 24 Jul 2009 17:31:34 -0000 1.24
--- cmConfigureFileCommand.h 16 Sep 2009 19:09:19 -0000 1.25
***************
*** 87,91 ****
std::string InputFile;
! std::string OuputFile;
bool CopyOnly;
bool EscapeQuotes;
--- 87,91 ----
std::string InputFile;
! std::string OutputFile;
bool CopyOnly;
bool EscapeQuotes;
More information about the Cmake-commits
mailing list