BUG: fix for bug 998, fix spelling errors
This commit is contained in:
parent
983919f5f3
commit
c8101e8e47
|
@ -66,7 +66,7 @@ IF(CMAKE_C_COMPILER)
|
||||||
ENDIF(CMAKE_C_COMPILER)
|
ENDIF(CMAKE_C_COMPILER)
|
||||||
IF(CMAKE_CXX_COMPILER)
|
IF(CMAKE_CXX_COMPILER)
|
||||||
GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_CXX_COMPILER} NAME_WE)
|
GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_CXX_COMPILER} NAME_WE)
|
||||||
# since the gnu compiler has several names force gcc
|
# since the gnu compiler has several names force g++
|
||||||
IF(CMAKE_COMPILER_IS_GNUCXX)
|
IF(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
SET(CMAKE_BASE_NAME g++)
|
SET(CMAKE_BASE_NAME g++)
|
||||||
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
|
|
|
@ -422,7 +422,7 @@ bool cmMakefile::ReadListFile(const char* filename_in, const char* external_in)
|
||||||
this->ExecuteCommand(lf->m_Functions[i]);
|
this->ExecuteCommand(lf->m_Functions[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
// send scope ended to and funciton blockers
|
// send scope ended to and function blockers
|
||||||
if (filename)
|
if (filename)
|
||||||
{
|
{
|
||||||
// loop over all function blockers to see if any block this command
|
// loop over all function blockers to see if any block this command
|
||||||
|
|
|
@ -67,7 +67,7 @@ void cmTarget::TraceVSDependencies(std::string projFile,
|
||||||
for(std::vector<std::string>::iterator id = depends.begin();
|
for(std::vector<std::string>::iterator id = depends.begin();
|
||||||
id != depends.end(); ++id)
|
id != depends.end(); ++id)
|
||||||
{
|
{
|
||||||
// if there is a cutom rule to generate that dependency
|
// if there is a custom rule to generate that dependency
|
||||||
// then add it to the list
|
// then add it to the list
|
||||||
cmSourceFile* outsf =
|
cmSourceFile* outsf =
|
||||||
makefile->GetSourceFileWithOutput(id->c_str());
|
makefile->GetSourceFileWithOutput(id->c_str());
|
||||||
|
@ -107,7 +107,7 @@ void cmTarget::TraceVSDependencies(std::string projFile,
|
||||||
// add in the project file itself
|
// add in the project file itself
|
||||||
srcFilesToProcess.push(projFile);
|
srcFilesToProcess.push(projFile);
|
||||||
srcFilesQueued.insert(projFile);
|
srcFilesQueued.insert(projFile);
|
||||||
// add in the library depends for cusotm targets
|
// add in the library depends for custom targets
|
||||||
if (this->GetType() == cmTarget::UTILITY)
|
if (this->GetType() == cmTarget::UTILITY)
|
||||||
{
|
{
|
||||||
for (std::vector<cmCustomCommand>::iterator ic =
|
for (std::vector<cmCustomCommand>::iterator ic =
|
||||||
|
|
|
@ -23,7 +23,7 @@ class cmakewizard
|
||||||
public:
|
public:
|
||||||
cmakewizard();
|
cmakewizard();
|
||||||
/**
|
/**
|
||||||
* Prompt the user to see if they want to see advanced entires.
|
* Prompt the user to see if they want to see advanced entries.
|
||||||
*/
|
*/
|
||||||
virtual bool AskAdvanced();
|
virtual bool AskAdvanced();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue