feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixes: Show the CMakeLists.txt file in the navigation widget and completion

Browse Source 
Task:     CMake support
Details:  No syntax highlighting
This commit is contained in:
dt
2009-03-03 17:56:03 +01:00
parent 6670cf1fc4
commit 8897284189
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -111,8 +111,12 @@ void CMakeProject::parseCMakeLists()
m_projectName = cbpparser.projectName(); m_projectName = cbpparser.projectName();
qDebug()<<"Building Tree"; qDebug()<<"Building Tree";
// TODO do a intelligent updating of the tree // TODO do a intelligent updating of the tree
buildTree(m_rootNode, cbpparser.fileList());
foreach (ProjectExplorer::FileNode *fn, cbpparser.fileList()) QList<ProjectExplorer::FileNode *> fileList = cbpparser.fileList();
// Manually add the CMakeLists.txt file
fileList.append(new ProjectExplorer::FileNode(sourceDirectory + "/CMakeLists.txt", ProjectExplorer::ProjectFileType, false));
buildTree(m_rootNode, fileList);
foreach (ProjectExplorer::FileNode *fn, fileList)
m_files.append(fn->path()); m_files.append(fn->path());
m_files.sort(); m_files.sort();
@@ -208,7 +212,7 @@ void CMakeProject::buildTree(CMakeProjectNode *rootNode, QList<ProjectExplorer::
ProjectExplorer::FolderNode *CMakeProject::findOrCreateFolder(CMakeProjectNode *rootNode, QString directory) ProjectExplorer::FolderNode *CMakeProject::findOrCreateFolder(CMakeProjectNode *rootNode, QString directory)
{ {
QString relativePath = QDir(QFileInfo(rootNode->path()).path()).relativeFilePath(directory); QString relativePath = QDir(QFileInfo(rootNode->path()).path()).relativeFilePath(directory);
QStringList parts = relativePath.split("/"); QStringList parts = relativePath.split("/", QString::SkipEmptyParts);
ProjectExplorer::FolderNode *parent = rootNode; ProjectExplorer::FolderNode *parent = rootNode;
foreach (const QString &part, parts) { foreach (const QString &part, parts) {
// Find folder in subFolders // Find folder in subFolders

5
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -110,7 +110,10 @@ QString CMakeManager::createXmlFile(const QStringList &arguments, const QString
buildDirectory.mkpath(buildDirectoryPath); buildDirectory.mkpath(buildDirectoryPath);
QProcess cmake; QProcess cmake;
cmake.setWorkingDirectory(buildDirectoryPath); cmake.setWorkingDirectory(buildDirectoryPath);
cmake.start(cmakeExecutable(), QStringList() << sourceDirectory << arguments << "-GCodeBlocks - Unix Makefiles");
QString generator = "-GCodeBlocks - Unix Makefiles";
cmake.start(cmakeExecutable(), QStringList() << sourceDirectory << arguments << generator);
qDebug()<<cmakeExecutable()<<sourceDirectory << arguments; qDebug()<<cmakeExecutable()<<sourceDirectory << arguments;
cmake.waitForFinished(-1); cmake.waitForFinished(-1);
cmake.setProcessChannelMode(QProcess::MergedChannels); cmake.setProcessChannelMode(QProcess::MergedChannels);