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

Disable file() and string() hash commands during bootstrap 

We do not compile support for the cryptographic hashes during bootstrap.
Disable the APIs that use them.
This commit is contained in:
Brad King 2011-11-16 11:03:30 -05:00
parent 9da8340a6d
commit b0853b5fae
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmFileCommand.cxx
View File

@ -352,6 +352,7 @@ bool cmFileCommand::HandleReadCommand(std::vector<std::string> const& args)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmFileCommand::HandleHashCommand(std::vector<std::string> const& args) bool cmFileCommand::HandleHashCommand(std::vector<std::string> const& args)
{ {
#if defined(CMAKE_BUILD_WITH_CMAKE)
if(args.size() != 3) if(args.size() != 3)
{ {
cmOStringStream e; cmOStringStream e;
@ -375,6 +376,12 @@ bool cmFileCommand::HandleHashCommand(std::vector<std::string> const& args)
this->SetError(e.str().c_str()); this->SetError(e.str().c_str());
} }
return false; return false;
#else
cmOStringStream e;
e << args[0] << " not available during bootstrap";
this->SetError(e.str().c_str());
return false;
#endif
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

7
Source/cmStringCommand.cxx
View File

@ -96,6 +96,7 @@ bool cmStringCommand
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmStringCommand::HandleHashCommand(std::vector<std::string> const& args) bool cmStringCommand::HandleHashCommand(std::vector<std::string> const& args)
{ {
#if defined(CMAKE_BUILD_WITH_CMAKE)
if(args.size() != 3) if(args.size() != 3)
{ {
cmOStringStream e; cmOStringStream e;
@ -112,6 +113,12 @@ bool cmStringCommand::HandleHashCommand(std::vector<std::string> const& args)
return true; return true;
} }
return false; return false;
#else
cmOStringStream e;
e << args[0] << " not available during bootstrap";
this->SetError(e.str().c_str());
return false;
#endif
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------