parent
38084147e1
commit
55303d6dd2
|
@ -340,7 +340,8 @@ void cmCTestScriptHandler::CreateCMake()
|
||||||
this->AddCTestCommand(new cmCTestUpdateCommand);
|
this->AddCTestCommand(new cmCTestUpdateCommand);
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmCTestScriptHandler::GetCommandDocumentation(std::vector<cmDocumentationEntry>& v) const
|
void cmCTestScriptHandler::GetCommandDocumentation(
|
||||||
|
std::vector<cmDocumentationEntry>& v) const
|
||||||
{
|
{
|
||||||
this->CMake->GetCommandDocumentation(v);
|
this->CMake->GetCommandDocumentation(v);
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,8 @@ static const cmDocumentationEntry cmDocumentationStandardOptions[] =
|
||||||
static const cmDocumentationEntry cmModulesDocumentationDescription[] =
|
static const cmDocumentationEntry cmModulesDocumentationDescription[] =
|
||||||
{
|
{
|
||||||
{0,
|
{0,
|
||||||
" CMake Modules - Modules coming with CMake, the Cross-Platform Makefile Generator.", 0},
|
" CMake Modules - Modules coming with CMake, the Cross-Platform Makefile "
|
||||||
|
"Generator.", 0},
|
||||||
// CMAKE_DOCUMENTATION_OVERVIEW,
|
// CMAKE_DOCUMENTATION_OVERVIEW,
|
||||||
{0,
|
{0,
|
||||||
"This is the documentation for the modules and scripts coming with CMake. "
|
"This is the documentation for the modules and scripts coming with CMake. "
|
||||||
|
@ -69,10 +70,10 @@ static const cmDocumentationEntry cmPropertiesDocumentationDescription[] =
|
||||||
// CMAKE_DOCUMENTATION_OVERVIEW,
|
// CMAKE_DOCUMENTATION_OVERVIEW,
|
||||||
{0,
|
{0,
|
||||||
"This is the documentation for the properties supported by CMake. "
|
"This is the documentation for the properties supported by CMake. "
|
||||||
"Properties can have different scopes. They can either be assigned to a source file, "
|
"Properties can have different scopes. They can either be assigned to a "
|
||||||
"a directory, a target or globally to CMake. "
|
"source file, a directory, a target or globally to CMake. By modifying the "
|
||||||
"By modifying the values of properties the behaviour of the buildsystem can be "
|
"values of properties the behaviour of the buildsystem can be customized.",
|
||||||
"customized.", 0},
|
0},
|
||||||
{0,0,0}
|
{0,0,0}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -84,9 +85,9 @@ static const cmDocumentationEntry cmCompatCommandsDocumentationDescription[] =
|
||||||
"Obsolete commands supported by CMake for compatibility.", 0},
|
"Obsolete commands supported by CMake for compatibility.", 0},
|
||||||
// CMAKE_DOCUMENTATION_OVERVIEW,
|
// CMAKE_DOCUMENTATION_OVERVIEW,
|
||||||
{0,
|
{0,
|
||||||
"This is the documentation for now obsolete listfile commands from "
|
"This is the documentation for now obsolete listfile commands from previous "
|
||||||
"previous CMake versions, which are still supported for compatibility reasons. "
|
"CMake versions, which are still supported for compatibility reasons. You "
|
||||||
"You should instead use the newer, faster and shinier new commands. ;-)", 0},
|
"should instead use the newer, faster and shinier new commands. ;-)", 0},
|
||||||
{0,0,0}
|
{0,0,0}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -813,7 +814,7 @@ void cmDocumentation
|
||||||
break;
|
break;
|
||||||
case cmProperty::DIRECTORY:
|
case cmProperty::DIRECTORY:
|
||||||
this->DirectoryPropertiesSection.Set(
|
this->DirectoryPropertiesSection.Set(
|
||||||
cmDocumentationDirectoryPropertiesHeader, section, 0);
|
cmDocumentationDirectoryPropertiesHeader, section, 0);
|
||||||
break;
|
break;
|
||||||
case cmProperty::TARGET:
|
case cmProperty::TARGET:
|
||||||
this->TargetPropertiesSection.Set(
|
this->TargetPropertiesSection.Set(
|
||||||
|
|
|
@ -63,7 +63,8 @@ public:
|
||||||
virtual const char* GetFullDocumentation()
|
virtual const char* GetFullDocumentation()
|
||||||
{
|
{
|
||||||
return
|
return
|
||||||
" EXPORT(TARGETS tgt1 tgt2 ... [PREFIX <prefix>] FILE <filename> [APPEND])\n"
|
" EXPORT(TARGETS tgt1 tgt2 ... [PREFIX <prefix>] FILE <filename> "
|
||||||
|
"[APPEND])\n"
|
||||||
"Create a file that can be included into a CMake listfile with the "
|
"Create a file that can be included into a CMake listfile with the "
|
||||||
"INCLUDE command. The file will contain a number of SET commands "
|
"INCLUDE command. The file will contain a number of SET commands "
|
||||||
"that will set all the variables needed for library dependency "
|
"that will set all the variables needed for library dependency "
|
||||||
|
|
|
@ -67,7 +67,8 @@ void cmExtraCodeBlocksGenerator::SetGlobalGenerator(
|
||||||
void cmExtraCodeBlocksGenerator::Generate()
|
void cmExtraCodeBlocksGenerator::Generate()
|
||||||
{
|
{
|
||||||
|
|
||||||
const cmMakefile* topLevelMakefile = this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
|
const cmMakefile* topLevelMakefile =
|
||||||
|
this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile();
|
||||||
|
|
||||||
std::string workspaceName = topLevelMakefile->GetProjectName();
|
std::string workspaceName = topLevelMakefile->GetProjectName();
|
||||||
std::string outputDir=topLevelMakefile->GetStartOutputDirectory();
|
std::string outputDir=topLevelMakefile->GetStartOutputDirectory();
|
||||||
|
@ -119,7 +120,8 @@ void cmExtraCodeBlocksGenerator::Generate()
|
||||||
|
|
||||||
/* create the project file, if it already exists, merge it with the
|
/* create the project file, if it already exists, merge it with the
|
||||||
existing one, otherwise create a new one */
|
existing one, otherwise create a new one */
|
||||||
void cmExtraCodeBlocksGenerator::CreateProjectFile(const std::vector<cmLocalGenerator*>& lgs)
|
void cmExtraCodeBlocksGenerator::CreateProjectFile(
|
||||||
|
const std::vector<cmLocalGenerator*>& lgs)
|
||||||
{
|
{
|
||||||
const cmMakefile* mf=lgs[0]->GetMakefile();
|
const cmMakefile* mf=lgs[0]->GetMakefile();
|
||||||
std::string outputDir=mf->GetStartOutputDirectory();
|
std::string outputDir=mf->GetStartOutputDirectory();
|
||||||
|
@ -245,7 +247,7 @@ void cmExtraCodeBlocksGenerator
|
||||||
case cmTarget::SHARED_LIBRARY:
|
case cmTarget::SHARED_LIBRARY:
|
||||||
case cmTarget::MODULE_LIBRARY:
|
case cmTarget::MODULE_LIBRARY:
|
||||||
{
|
{
|
||||||
const std::vector<cmSourceFile*>& sources=ti->second.GetSourceFiles();
|
const std::vector<cmSourceFile*>&sources=ti->second.GetSourceFiles();
|
||||||
for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
|
for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
|
||||||
si!=sources.end(); si++)
|
si!=sources.end(); si++)
|
||||||
{
|
{
|
||||||
|
@ -258,7 +260,8 @@ void cmExtraCodeBlocksGenerator
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (std::map<std::string, std::string>::const_iterator sit=sourceFiles.begin();
|
for (std::map<std::string, std::string>::const_iterator
|
||||||
|
sit=sourceFiles.begin();
|
||||||
sit!=sourceFiles.end();
|
sit!=sourceFiles.end();
|
||||||
++sit)
|
++sit)
|
||||||
{
|
{
|
||||||
|
|
|
@ -35,10 +35,10 @@ public:
|
||||||
virtual void SetGlobalGenerator(cmGlobalGenerator* generator);
|
virtual void SetGlobalGenerator(cmGlobalGenerator* generator);
|
||||||
|
|
||||||
virtual const char* GetName() const
|
virtual const char* GetName() const
|
||||||
{ return cmExtraCodeBlocksGenerator::GetActualName();}
|
{ return cmExtraCodeBlocksGenerator::GetActualName();}
|
||||||
static const char* GetActualName() { return "CodeBlocks";}
|
static const char* GetActualName() { return "CodeBlocks";}
|
||||||
static cmExternalMakefileProjectGenerator* New()
|
static cmExternalMakefileProjectGenerator* New()
|
||||||
{ return new cmExtraCodeBlocksGenerator; }
|
{ return new cmExtraCodeBlocksGenerator; }
|
||||||
/** Get the documentation entry for this generator. */
|
/** Get the documentation entry for this generator. */
|
||||||
virtual void GetDocumentation(cmDocumentationEntry& entry,
|
virtual void GetDocumentation(cmDocumentationEntry& entry,
|
||||||
const char* fullName) const;
|
const char* fullName) const;
|
||||||
|
|
|
@ -429,7 +429,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
|
||||||
std::string binaryFileName = this->Makefile->GetCurrentOutputDirectory();
|
std::string binaryFileName = this->Makefile->GetCurrentOutputDirectory();
|
||||||
binaryFileName += cmake::GetCMakeFilesDirectory();
|
binaryFileName += cmake::GetCMakeFilesDirectory();
|
||||||
binaryFileName += "/FileCommandStringsBinaryFile";
|
binaryFileName += "/FileCommandStringsBinaryFile";
|
||||||
if (cmHexFileConverter::TryConvert(fileName.c_str(), binaryFileName.c_str()))
|
if(cmHexFileConverter::TryConvert(fileName.c_str(),binaryFileName.c_str()))
|
||||||
{
|
{
|
||||||
fileName = binaryFileName;
|
fileName = binaryFileName;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1144,7 +1144,8 @@ void cmGlobalGenerator::GetEnabledLanguages(std::vector<std::string>& lang)
|
||||||
|
|
||||||
int cmGlobalGenerator::GetLinkerPreference(const char* lang)
|
int cmGlobalGenerator::GetLinkerPreference(const char* lang)
|
||||||
{
|
{
|
||||||
std::map<cmStdString, int>::const_iterator it = this->LanguageToLinkerPreference.find(lang);
|
std::map<cmStdString, int>::const_iterator it =
|
||||||
|
this->LanguageToLinkerPreference.find(lang);
|
||||||
if (it != this->LanguageToLinkerPreference.end())
|
if (it != this->LanguageToLinkerPreference.end())
|
||||||
{
|
{
|
||||||
return it->second;
|
return it->second;
|
||||||
|
@ -1287,7 +1288,7 @@ cmTarget* cmGlobalGenerator::FindTarget(const char* project,
|
||||||
for(unsigned int i = 0; i < gens->size(); ++i)
|
for(unsigned int i = 0; i < gens->size(); ++i)
|
||||||
{
|
{
|
||||||
cmTarget* ret = (*gens)[i]->GetMakefile()->FindTarget(name,
|
cmTarget* ret = (*gens)[i]->GetMakefile()->FindTarget(name,
|
||||||
useImportedTargets);
|
useImportedTargets);
|
||||||
if(ret)
|
if(ret)
|
||||||
{
|
{
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -1551,9 +1552,10 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
|
||||||
{
|
{
|
||||||
cmCustomCommandLine localCmdLine = singleLine;
|
cmCustomCommandLine localCmdLine = singleLine;
|
||||||
|
|
||||||
localCmdLine.insert(localCmdLine.begin()+1, "-DCMAKE_INSTALL_LOCAL_ONLY=1");
|
localCmdLine.insert(localCmdLine.begin()+1,
|
||||||
|
"-DCMAKE_INSTALL_LOCAL_ONLY=1");
|
||||||
cpackCommandLines.erase(cpackCommandLines.begin(),
|
cpackCommandLines.erase(cpackCommandLines.begin(),
|
||||||
cpackCommandLines.end());
|
cpackCommandLines.end());
|
||||||
cpackCommandLines.push_back(localCmdLine);
|
cpackCommandLines.push_back(localCmdLine);
|
||||||
|
|
||||||
(*targets)[install_local] =
|
(*targets)[install_local] =
|
||||||
|
@ -1684,7 +1686,7 @@ std::vector<cmTarget *>& cmGlobalGenerator
|
||||||
// Don't emit the same utility twice for this target.
|
// Don't emit the same utility twice for this target.
|
||||||
if(emitted.insert(*util).second)
|
if(emitted.insert(*util).second)
|
||||||
{
|
{
|
||||||
cmTarget *target2 = target.GetMakefile()->FindTarget(util->c_str(), false);
|
cmTarget *target2=target.GetMakefile()->FindTarget(util->c_str(), false);
|
||||||
|
|
||||||
// search each local generator until a match is found
|
// search each local generator until a match is found
|
||||||
if (!target2)
|
if (!target2)
|
||||||
|
|
|
@ -179,7 +179,9 @@ public:
|
||||||
void FindMakeProgram(cmMakefile*);
|
void FindMakeProgram(cmMakefile*);
|
||||||
|
|
||||||
///! Find a target by name by searching the local generators.
|
///! Find a target by name by searching the local generators.
|
||||||
cmTarget* FindTarget(const char* project, const char* name, bool useImportedTargets);
|
cmTarget* FindTarget(const char* project,
|
||||||
|
const char* name,
|
||||||
|
bool useImportedTargets);
|
||||||
|
|
||||||
/** If check to see if the target is linked to by any other
|
/** If check to see if the target is linked to by any other
|
||||||
target in the project */
|
target in the project */
|
||||||
|
@ -218,7 +220,8 @@ public:
|
||||||
// what targets does the specified target depend on
|
// what targets does the specified target depend on
|
||||||
std::vector<cmTarget *>& GetTargetDepends(cmTarget& target);
|
std::vector<cmTarget *>& GetTargetDepends(cmTarget& target);
|
||||||
|
|
||||||
const std::map<cmStdString, std::vector<cmLocalGenerator*> >& GetProjectMap() const {return this->ProjectMap;}
|
const std::map<cmStdString, std::vector<cmLocalGenerator*> >& GetProjectMap()
|
||||||
|
const {return this->ProjectMap;}
|
||||||
protected:
|
protected:
|
||||||
void SetLanguageEnabledFlag(const char* l, cmMakefile* mf);
|
void SetLanguageEnabledFlag(const char* l, cmMakefile* mf);
|
||||||
void SetLanguageEnabledMaps(const char* l, cmMakefile* mf);
|
void SetLanguageEnabledMaps(const char* l, cmMakefile* mf);
|
||||||
|
|
|
@ -153,7 +153,8 @@ static bool ConvertIntelHexLine(const char* buf, FILE* outFile)
|
||||||
dataStart = 9;
|
dataStart = 9;
|
||||||
}
|
}
|
||||||
// ignore extra address records
|
// ignore extra address records
|
||||||
else if ((buf[8] == '2') || (buf[8] == '3') || (buf[8] == '4') || (buf[8] == '5'))
|
else if ((buf[8] == '2') || (buf[8] == '3') || (buf[8] == '4')
|
||||||
|
|| (buf[8] == '5'))
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,9 @@ bool cmIncludeExternalMSProjectCommand
|
||||||
cmSystemTools::ConvertToUnixSlashes(path);
|
cmSystemTools::ConvertToUnixSlashes(path);
|
||||||
|
|
||||||
// Create a target instance for this utility.
|
// Create a target instance for this utility.
|
||||||
cmTarget* target=this->Makefile->AddNewTarget(cmTarget::UTILITY, utility_name.c_str(), false);
|
cmTarget* target=this->Makefile->AddNewTarget(cmTarget::UTILITY,
|
||||||
|
utility_name.c_str(),
|
||||||
|
false);
|
||||||
target->SetProperty("EXCLUDE_FROM_ALL","FALSE");
|
target->SetProperty("EXCLUDE_FROM_ALL","FALSE");
|
||||||
std::vector<std::string> no_outputs;
|
std::vector<std::string> no_outputs;
|
||||||
cmCustomCommandLines commandLines;
|
cmCustomCommandLines commandLines;
|
||||||
|
|
|
@ -939,7 +939,7 @@ void cmMakefile::AddLinkLibraryForTarget(const char *target,
|
||||||
if ( i != this->Targets.end())
|
if ( i != this->Targets.end())
|
||||||
{
|
{
|
||||||
cmTarget* tgt =
|
cmTarget* tgt =
|
||||||
this->GetCMakeInstance()->GetGlobalGenerator()->FindTarget(0, lib, false);
|
this->GetCMakeInstance()->GetGlobalGenerator()->FindTarget(0,lib,false);
|
||||||
if(tgt)
|
if(tgt)
|
||||||
{
|
{
|
||||||
bool allowModules = true;
|
bool allowModules = true;
|
||||||
|
|
|
@ -167,7 +167,9 @@ public:
|
||||||
void AddDefineFlag(const char* definition);
|
void AddDefineFlag(const char* definition);
|
||||||
void RemoveDefineFlag(const char* definition);
|
void RemoveDefineFlag(const char* definition);
|
||||||
|
|
||||||
cmTarget* AddNewTarget(cmTarget::TargetType type, const char* name, bool isImported);
|
cmTarget* AddNewTarget(cmTarget::TargetType type,
|
||||||
|
const char* name,
|
||||||
|
bool isImported);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add an executable to the build.
|
* Add an executable to the build.
|
||||||
|
|
|
@ -62,9 +62,9 @@ public:
|
||||||
" TRY_COMPILE(RESULT_VAR bindir srcdir\n"
|
" TRY_COMPILE(RESULT_VAR bindir srcdir\n"
|
||||||
" projectName <targetname> [CMAKE_FLAGS <Flags>]\n"
|
" projectName <targetname> [CMAKE_FLAGS <Flags>]\n"
|
||||||
" [OUTPUT_VARIABLE var])\n"
|
" [OUTPUT_VARIABLE var])\n"
|
||||||
"Try compiling a program. In this form, srcdir should contain a complete "
|
"Try compiling a program. In this form, srcdir should contain a "
|
||||||
"CMake project with a CMakeLists.txt file and all sources. The bindir and "
|
"complete CMake project with a CMakeLists.txt file and all sources. The "
|
||||||
"srcdir will not be deleted after this command is run. "
|
"bindir and srcdir will not be deleted after this command is run. "
|
||||||
"If <target name> is specified then build just that target "
|
"If <target name> is specified then build just that target "
|
||||||
"otherwise the all or ALL_BUILD target is built.\n"
|
"otherwise the all or ALL_BUILD target is built.\n"
|
||||||
" TRY_COMPILE(RESULT_VAR bindir srcfile\n"
|
" TRY_COMPILE(RESULT_VAR bindir srcfile\n"
|
||||||
|
|
|
@ -102,8 +102,11 @@ public:
|
||||||
|
|
||||||
cmTypeMacro(cmTryRunCommand, cmCoreTryCompile);
|
cmTypeMacro(cmTryRunCommand, cmCoreTryCompile);
|
||||||
private:
|
private:
|
||||||
void RunExecutable(const std::string& runArgs, std::string* runOutputContents);
|
void RunExecutable(const std::string& runArgs,
|
||||||
void DoNotRunExecutable(const std::string& runArgs, const std::string& srcFile, std::string* runOutputContents);
|
std::string* runOutputContents);
|
||||||
|
void DoNotRunExecutable(const std::string& runArgs,
|
||||||
|
const std::string& srcFile,
|
||||||
|
std::string* runOutputContents);
|
||||||
|
|
||||||
std::string CompileResultVariable;
|
std::string CompileResultVariable;
|
||||||
std::string RunResultVariable;
|
std::string RunResultVariable;
|
||||||
|
|
|
@ -336,7 +336,8 @@ protected:
|
||||||
void AddDefaultCommands();
|
void AddDefaultCommands();
|
||||||
void AddDefaultGenerators();
|
void AddDefaultGenerators();
|
||||||
void AddDefaultExtraGenerators();
|
void AddDefaultExtraGenerators();
|
||||||
void AddExtraGenerator(const char* name, CreateExtraGeneratorFunctionType newFunction);
|
void AddExtraGenerator(const char* name,
|
||||||
|
CreateExtraGeneratorFunctionType newFunction);
|
||||||
|
|
||||||
cmGlobalGenerator *GlobalGenerator;
|
cmGlobalGenerator *GlobalGenerator;
|
||||||
cmCacheManager *CacheManager;
|
cmCacheManager *CacheManager;
|
||||||
|
|
Loading…
Reference in New Issue