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

ENH: Try to see if GenerateBuildCommand produces apropriate result

This commit is contained in:
Andy Cedilnik 2005-04-29 12:50:29 -04:00
parent 61d0a75d11
commit 1fff4183c2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmBuildCommand.cxx
View File

@ -16,6 +16,9 @@
=========================================================================*/ =========================================================================*/
#include "cmBuildCommand.h" #include "cmBuildCommand.h"
#include "cmLocalGenerator.h"
#include "cmGlobalGenerator.h"
// cmBuildCommand // cmBuildCommand
bool cmBuildCommand::InitialPass(std::vector<std::string> const& args) bool cmBuildCommand::InitialPass(std::vector<std::string> const& args)
{ {
@ -27,12 +30,10 @@ bool cmBuildCommand::InitialPass(std::vector<std::string> const& args)
const char* define = args[0].c_str(); const char* define = args[0].c_str();
const char* cacheValue const char* cacheValue
= m_Makefile->GetDefinition(define); = m_Makefile->GetDefinition(define);
if(cacheValue)
{
return true;
}
std::string makecommand; std::string makecommand;
std::string makeprogram = args[1]; std::string makeprogram = args[1];
std::string makecmd = m_Makefile->GetLocalGenerator()->GetGlobalGenerator()->GenerateBuildCommand(
makeprogram.c_str(), m_Makefile->GetProjectName(), 0, "Release", true);
if(makeprogram.find("msdev") != std::string::npos || if(makeprogram.find("msdev") != std::string::npos ||
makeprogram.find("MSDEV") != std::string::npos ) makeprogram.find("MSDEV") != std::string::npos )
{ {
@ -62,6 +63,11 @@ bool cmBuildCommand::InitialPass(std::vector<std::string> const& args)
makecommand = makeprogram; makecommand = makeprogram;
makecommand += " -i"; makecommand += " -i";
} }
std::cerr << "-- Compare: " << makecommand.c_str() << " and " << makecmd.c_str() << ": " << (makecmd == makecommand) << std::endl;
if(cacheValue)
{
return true;
}
m_Makefile->AddCacheDefinition(define, m_Makefile->AddCacheDefinition(define,
makecommand.c_str(), makecommand.c_str(),
"Command used to build entire project " "Command used to build entire project "