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

Define flags in CMAKE_C(XX)_FLAGS are now included in SublimeClang settings. 

Changed the the SublimeText2 generator name to Sublime Text 2.

Fixed a minor issue where if the build directory was outside of the source
directory an unnecessary folder_exclude_pattern was generated in the
Sublime Text 2 project file.
This commit is contained in:
Morné Chamberlain 2012-10-18 22:54:19 +02:00
parent d022d4ec78
commit 8670cbe166
2 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Source/cmExtraSublimeTextGenerator.cxx
View File

@ -117,9 +117,14 @@ void cmExtraSublimeTextGenerator
cmSystemTools::RelativePath(lgs[0]->GetMakefile()->GetHomeDirectory(),
lgs[0]->GetMakefile()->
GetHomeOutputDirectory());
if ((!outputRelativeToSourceRoot.empty()) &&
((outputRelativeToSourceRoot.length() < 3) ||
(outputRelativeToSourceRoot.substr(0, 3) != "../")))
{
fout << ",\n\t\t\t\"folder_exclude_patterns\": [\"" <<
outputRelativeToSourceRoot << "\"]";
}
}
else
{
fout << "\t{\n\t\t\t\"path\": \"./\"";
@ -303,7 +308,32 @@ void cmExtraSublimeTextGenerator::
}
}
// Generate the build_system entry for one target
void cmExtraSublimeTextGenerator::
ExtractDefines(const char* value, bool check,
std::set<std::string> &defines)
{
std::vector<std::string> defs;
cmSystemTools::ExpandListArgument(value, defs);
for(std::vector<std::string>::const_iterator di = defs.begin();
di != defs.end(); ++di)
{
cmXMLSafe safedef(di->c_str());
if (check)
{
std::string safedefString = safedef.str();
if ((safedefString.length() >= 2) &&
(safedefString.substr(0, 2) == "-D"))
{
defines.insert(safedefString.substr(2));
}
}
else
{
defines.insert(safedef.str());
}
}
}
void cmExtraSublimeTextGenerator::AppendTarget(cmGeneratedFileStream& fout,
const char* targetName,
cmTarget* target,
@ -321,20 +351,13 @@ void cmExtraSublimeTextGenerator::AppendTarget(cmGeneratedFileStream& fout,
cmGeneratorTarget *gtgt = this->GlobalGenerator
->GetGeneratorTarget(target);
std::string cdefs = gtgt->GetCompileDefinitions();
if(!cdefs.empty())
{
// Expand the list.
std::vector<std::string> defs;
cmSystemTools::ExpandListArgument(cdefs.c_str(), defs);
for(std::vector<std::string>::const_iterator di = defs.begin();
di != defs.end(); ++di)
{
cmXMLSafe safedef(di->c_str());
defines.insert(safedef.str());
}
}
ExtractDefines(cdefs.c_str(), false, defines);
// Get compiler definitions from CMAKE_CXX_FLAGS and CMAKE_C_FLAGS as
// well, in case the user set those flags directly
std::string cflags = makefile->GetSafeDefinition("CMAKE_CXX_FLAGS");
ExtractDefines(cflags.c_str(), true, defines);
cflags = makefile->GetSafeDefinition("CMAKE_C_FLAGS");
ExtractDefines(cflags.c_str(), true, defines);
// the include directories for this target
std::vector<std::string> includes;
target->GetMakefile()->GetLocalGenerator()->

4
Source/cmExtraSublimeTextGenerator.h
View File

@ -69,7 +69,9 @@ private:
const char* compiler,
std::set<std::string>& includeDirs,
std::set<std::string>& defines, bool firstTarget);
/** Extracts -D compile flags from a variable */
void ExtractDefines(const char* value, bool check,
std::set<std::string> &defines);
};
#endif