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

Fixed Sublime Text project generation for in-source builds 

Fixed the issue where for in-source builds the source directory
(which is also the build directory) was excluded from the project file.
This commit is contained in:
Morné Chamberlain 2012-10-14 17:37:51 +02:00
parent 44f35f7824
commit 9cd3e7071f
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Source/cmExtraSublimeTextGenerator.cxx
View File

@ -107,26 +107,38 @@ void cmExtraSublimeTextGenerator
const std::string &sourceRootRelativeToOutput = cmSystemTools::RelativePath( const std::string &sourceRootRelativeToOutput = cmSystemTools::RelativePath(
lgs[0]->GetMakefile()->GetHomeOutputDirectory(), lgs[0]->GetMakefile()->GetHomeOutputDirectory(),
lgs[0]->GetMakefile()->GetHomeDirectory()); lgs[0]->GetMakefile()->GetHomeDirectory());
const std::string &outputRelativeToSourceRoot = cmSystemTools::RelativePath(
lgs[0]->GetMakefile()->GetHomeDirectory(),
lgs[0]->GetMakefile()->GetHomeOutputDirectory());
// Write the folder entries to the project file // Write the folder entries to the project file
fout << "{\n"; fout << "{\n";
fout << "\t\"folders\":\n\t[\n\t"; fout << "\t\"folders\":\n\t[\n\t";
fout << "\t{\n\t\t\t\"path\": \"" << sourceRootRelativeToOutput << "\",\n"; if (!sourceRootRelativeToOutput.empty())
fout << "\t\t\t\"folder_exclude_patterns\": [\"" << {
outputRelativeToSourceRoot << "\"],\n"; fout << "\t{\n\t\t\t\"path\": \"" << sourceRootRelativeToOutput << "\"";
fout << "\t\t\t\"file_exclude_patterns\": []\n"; const std::string &outputRelativeToSourceRoot =
fout << "\t\t},\n\t"; cmSystemTools::RelativePath(lgs[0]->GetMakefile()->GetHomeDirectory(),
lgs[0]->GetMakefile()->
GetHomeOutputDirectory());
fout << ",\n\t\t\t\"folder_exclude_patterns\": [\"" <<
outputRelativeToSourceRoot << "\"]";
}
else
{
fout << "\t{\n\t\t\t\"path\": \"./\"";
}
fout << "\n\t\t}";
// In order for SublimeClang's path resolution to work, the directory that // In order for SublimeClang's path resolution to work, the directory that
// contains the sublime-project file must be included here. We just ensure // contains the sublime-project file must be included here. We just ensure
// that no files or subfolders are included // that no files or subfolders are included.
fout << "\t{\n\t\t\t\"path\": \"./\",\n"; // In the case of an in-source build, however, this must not be used, since
// it'll end up excluding the source directory.
if (!sourceRootRelativeToOutput.empty())
{
fout << ",\n\t\t{\n\t\t\t\"path\": \"./\",\n";
fout << "\t\t\t\"folder_exclude_patterns\": [\"*\"],\n"; fout << "\t\t\t\"folder_exclude_patterns\": [\"*\"],\n";
fout << "\t\t\t\"file_exclude_patterns\": [\"*\"]\n"; fout << "\t\t\t\"file_exclude_patterns\": [\"*\"]\n";
fout << "\t\t}\n\t"; fout << "\t\t}";
}
// End of the folders section // End of the folders section
fout << "]"; fout << "\n\t]";
// Write the beginning of the build systems section to the project file // Write the beginning of the build systems section to the project file
fout << ",\n\t\"build_systems\":\n\t[\n\t"; fout << ",\n\t\"build_systems\":\n\t[\n\t";