kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

STYLE: Fix some style errors

Browse Source
This commit is contained in:
Andy Cedilnik 2006-07-10 07:52:35 -04:00
parent c944a60b17
commit 0f28edbe4a
2 changed files with 88 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/CPack/cpack.cxx
View File

@ -276,11 +276,13 @@ int main (int argc, char *argv[])
} }
if ( !cpackProjectVersion.empty() ) if ( !cpackProjectVersion.empty() )
{ {
globalMF->AddDefinition("CPACK_PACKAGE_VERSION", cpackProjectVersion.c_str()); globalMF->AddDefinition("CPACK_PACKAGE_VERSION",
cpackProjectVersion.c_str());
} }
if ( !cpackProjectVendor.empty() ) if ( !cpackProjectVendor.empty() )
{ {
globalMF->AddDefinition("CPACK_PACKAGE_VENDOR", cpackProjectVendor.c_str()); globalMF->AddDefinition("CPACK_PACKAGE_VENDOR",
cpackProjectVendor.c_str());
} }
if ( !cpackProjectDirectory.empty() ) if ( !cpackProjectDirectory.empty() )
{ {
@ -333,7 +335,8 @@ int main (int argc, char *argv[])
{ {
cmCPack_Log(&log, cmCPackLog::LOG_ERROR, cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
"CPack project version not specified" << std::endl "CPack project version not specified" << std::endl
<< "Specify CPACK_PACKAGE_VERSION, or CPACK_PACKAGE_VERSION_MAJOR, " << "Specify CPACK_PACKAGE_VERSION, or "
"CPACK_PACKAGE_VERSION_MAJOR, "
"CPACK_PACKAGE_VERSION_MINOR, and CPACK_PACKAGE_VERSION_PATCH." "CPACK_PACKAGE_VERSION_MINOR, and CPACK_PACKAGE_VERSION_PATCH."
<< std::endl); << std::endl);
parsed = 0; parsed = 0;
@ -360,9 +363,10 @@ int main (int argc, char *argv[])
!mf->GetDefinition("CPACK_INSTALL_CMAKE_PROJECTS") ) !mf->GetDefinition("CPACK_INSTALL_CMAKE_PROJECTS") )
{ {
cmCPack_Log(&log, cmCPackLog::LOG_ERROR, cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
"Please specify build tree of the project that uses CMake using " "Please specify build tree of the project that uses CMake "
" CPACK_INSTALL_CMAKE_PROJECTS, specify CPACK_INSTALL_COMMANDS, or " "using CPACK_INSTALL_CMAKE_PROJECTS, specify "
"specify CPACK_INSTALLED_DIRECTORIES." "CPACK_INSTALL_COMMANDS, or specify "
"CPACK_INSTALLED_DIRECTORIES."
<< std::endl); << std::endl);
parsed = 0; parsed = 0;
} }

3
Source/cmMakefileTargetGenerator.cxx
View File

@ -311,7 +311,8 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(cmSourceFile& source)
this->Objects.push_back(obj); this->Objects.push_back(obj);
// TODO: Remove // TODO: Remove
//std::string relativeObj = this->LocalGenerator->GetHomeRelativeOutputPath(); //std::string relativeObj
//= this->LocalGenerator->GetHomeRelativeOutputPath();
//relativeObj += obj; //relativeObj += obj;
// we compute some depends when writing the depend.make that we will also // we compute some depends when writing the depend.make that we will also