CMake: Support building a single file

Fixes: QTCREATORBUG-18898
Change-Id: I0ec24b20bfa8d43093b6e6681ddd752fbdea2088
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2019-05-26 23:48:40 +03:00
committed by Orgad Shaneh
parent a7345b67c1
commit b500119fd7
6 changed files with 140 additions and 0 deletions

View File

@@ -38,6 +38,8 @@ const char RUNCMAKE[] = "CMakeProject.RunCMake";
const char CLEARCMAKECACHE[] = "CMakeProject.ClearCache";
const char RESCANPROJECT[] = "CMakeProject.RescanProject";
const char RUNCMAKECONTEXTMENU[] = "CMakeProject.RunCMakeContextMenu";
const char BUILDFILECONTEXTMENU[] = "CMakeProject.BuildFileContextMenu";
const char BUILDFILE[] = "CMakeProject.BuildFile";
// Project
const char CMAKEPROJECT_ID[] = "CMakeProjectManager.CMakeProject";

View File

@@ -30,11 +30,14 @@
#include "cmakeproject.h"
#include "cmakesettingspage.h"
#include "cmaketoolmanager.h"
#include "cmakeprojectnodes.h"
#include <coreplugin/icore.h>
#include <coreplugin/messagemanager.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/editormanager/editormanager.h>
#include <projectexplorer/buildmanager.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h>
@@ -42,6 +45,8 @@
#include <projectexplorer/session.h>
#include <projectexplorer/target.h>
#include <utils/parameteraction.h>
#include <QAction>
#include <QDateTime>
#include <QIcon>
@@ -61,6 +66,8 @@ CMakeManager::CMakeManager() :
Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_PROJECTCONTEXT);
Core::ActionContainer *msubproject =
Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_SUBPROJECTCONTEXT);
Core::ActionContainer *mfile =
Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_FILECONTEXT);
const Core::Context projectContext(CMakeProjectManager::Constants::CMAKEPROJECT_ID);
const Core::Context globalContext(Core::Constants::C_GLOBAL);
@@ -90,6 +97,14 @@ CMakeManager::CMakeManager() :
runCMake(ProjectTree::currentProject());
});
m_buildFileContextMenu = new QAction(tr("Build"), this);
command = Core::ActionManager::registerAction(m_buildFileContextMenu,
Constants::BUILDFILECONTEXTMENU, projectContext);
command->setAttribute(Core::Command::CA_Hide);
mfile->addAction(command, ProjectExplorer::Constants::G_FILE_OTHER);
connect(m_buildFileContextMenu, &QAction::triggered,
this, &CMakeManager::buildFileContextMenu);
command = Core::ActionManager::registerAction(m_rescanProjectAction,
Constants::RESCANPROJECT, globalContext);
command->setAttribute(Core::Command::CA_Hide);
@@ -98,10 +113,24 @@ CMakeManager::CMakeManager() :
rescanProject(ProjectTree::currentProject());
});
m_buildFileAction = new Utils::ParameterAction(tr("Build File"), tr("Build File \"%1\""),
Utils::ParameterAction::AlwaysEnabled, this);
command = Core::ActionManager::registerAction(m_buildFileAction, Constants::BUILDFILE);
command->setAttribute(Core::Command::CA_Hide);
command->setAttribute(Core::Command::CA_UpdateText);
command->setDescription(m_buildFileAction->text());
command->setDefaultKeySequence(QKeySequence(tr("Ctrl+Alt+B")));
mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_BUILD);
connect(m_buildFileAction, &QAction::triggered, this, [this] { buildFile(); });
connect(SessionManager::instance(), &SessionManager::startupProjectChanged,
this, &CMakeManager::updateCmakeActions);
connect(BuildManager::instance(), &BuildManager::buildStateChanged,
this, &CMakeManager::updateCmakeActions);
connect(Core::EditorManager::instance(), &Core::EditorManager::currentEditorChanged,
this, &CMakeManager::updateBuildFileAction);
connect(ProjectTree::instance(), &ProjectTree::currentNodeChanged,
this, &CMakeManager::updateCmakeActions);
updateCmakeActions();
}
@@ -113,6 +142,7 @@ void CMakeManager::updateCmakeActions()
m_runCMakeAction->setVisible(visible);
m_clearCMakeCacheAction->setVisible(visible);
m_rescanProjectAction->setVisible(visible);
enableBuildFileMenus(ProjectTree::currentNode());
}
void CMakeManager::clearCMakeCache(Project *project)
@@ -144,3 +174,89 @@ void CMakeManager::rescanProject(Project *project)
cmakeProject->runCMakeAndScanProjectTree();// by my experience: every rescan run requires cmake run too
}
void CMakeManager::updateBuildFileAction()
{
Node *node = nullptr;
if (Core::IDocument *currentDocument = Core::EditorManager::currentDocument())
node = ProjectTree::nodeForFile(currentDocument->filePath());
enableBuildFileMenus(node);
}
void CMakeManager::enableBuildFileMenus(Node *node)
{
m_buildFileAction->setVisible(false);
m_buildFileAction->setEnabled(false);
m_buildFileAction->setParameter(QString());
m_buildFileContextMenu->setEnabled(false);
if (!node)
return;
Project *project = ProjectTree::projectForNode(node);
if (!project)
return;
Target *target = project->activeTarget();
if (!target)
return;
const QString generator = CMakeGeneratorKitAspect::generator(target->kit());
if (generator != "Ninja" && !generator.contains("Makefiles"))
return;
if (const FileNode *fileNode = node->asFileNode()) {
const FileType type = fileNode->fileType();
const bool visible = qobject_cast<CMakeProject *>(project)
&& dynamic_cast<CMakeTargetNode *>(node->parentProjectNode())
&& (type == FileType::Source || type == FileType::Header);
const bool enabled = visible && !BuildManager::isBuilding(project);
m_buildFileAction->setVisible(visible);
m_buildFileAction->setEnabled(enabled);
m_buildFileAction->setParameter(node->filePath().fileName());
m_buildFileContextMenu->setEnabled(enabled);
}
}
void CMakeManager::buildFile(Node *node)
{
if (!node) {
Core::IDocument *currentDocument= Core::EditorManager::currentDocument();
if (!currentDocument)
return;
const Utils::FilePath file = currentDocument->filePath();
node = ProjectTree::nodeForFile(file);
}
FileNode *fileNode = node ? node->asFileNode() : nullptr;
if (!fileNode)
return;
Project *project = ProjectTree::projectForNode(fileNode);
if (!project)
return;
CMakeTargetNode *targetNode = dynamic_cast<CMakeTargetNode *>(fileNode->parentProjectNode());
if (!targetNode)
return;
auto cmakeProject = static_cast<CMakeProject *>(project);
Target *target = cmakeProject->activeTarget();
const QString generator = CMakeGeneratorKitAspect::generator(target->kit());
const QString relativeSource = fileNode->filePath().relativeChildPath(targetNode->filePath()).toString();
const QString objExtension = Utils::HostOsInfo::isWindowsHost() ? QString(".obj") : QString(".o");
Utils::FilePath targetBase;
if (generator == "Ninja") {
BuildConfiguration *bc = target->activeBuildConfiguration();
const Utils::FilePath relativeBuildDir = targetNode->buildDirectory().relativeChildPath(
bc->buildDirectory());
targetBase = relativeBuildDir
.pathAppended("CMakeFiles")
.pathAppended(targetNode->displayName() + ".dir");
} else if (!generator.contains("Makefiles")) {
Core::MessageManager::write(tr("Build File is not supported for generator \"%1\"")
.arg(generator));
return;
}
cmakeProject->buildCMakeTarget(targetBase.pathAppended(relativeSource).toString() + objExtension);
}
void CMakeManager::buildFileContextMenu()
{
if (Node *node = ProjectTree::currentNode())
buildFile(node);
}

View File

@@ -27,6 +27,8 @@
#include <projectexplorer/project.h>
namespace Utils { class ParameterAction; }
QT_BEGIN_NAMESPACE
class QAction;
QT_END_NAMESPACE
@@ -46,11 +48,17 @@ private:
void clearCMakeCache(ProjectExplorer::Project *project);
void runCMake(ProjectExplorer::Project *project);
void rescanProject(ProjectExplorer::Project *project);
void buildFileContextMenu();
void buildFile(ProjectExplorer::Node *node = nullptr);
void updateBuildFileAction();
void enableBuildFileMenus(ProjectExplorer::Node *node);
QAction *m_runCMakeAction;
QAction *m_clearCMakeCacheAction;
QAction *m_runCMakeActionContextMenu;
QAction *m_rescanProjectAction;
QAction *m_buildFileContextMenu;
Utils::ParameterAction *m_buildFileAction;
};
} // namespace Internal

View File

@@ -191,6 +191,16 @@ QString CMakeTargetNode::buildKey() const
return generateId(filePath(), m_target);
}
Utils::FilePath CMakeTargetNode::buildDirectory() const
{
return m_buildDirectory;
}
void CMakeTargetNode::setBuildDirectory(const Utils::FilePath &directory)
{
m_buildDirectory = directory;
}
QVariant CMakeTargetNode::data(Core::Id role) const
{
auto value = [this](const QByteArray &key) -> QVariant {

View File

@@ -69,6 +69,8 @@ public:
QString tooltip() const final;
QString buildKey() const final;
Utils::FilePath buildDirectory() const;
void setBuildDirectory(const Utils::FilePath &directory);
bool supportsAction(ProjectExplorer::ProjectAction action, const Node *node) const override;
bool addFiles(const QStringList &filePaths, QStringList *notAdded) override;
@@ -79,6 +81,7 @@ public:
private:
QString m_tooltip;
Utils::FilePath m_buildDirectory;
CMakeConfig m_config;
};

View File

@@ -862,6 +862,7 @@ void ServerModeReader::addTargets(const QHash<Utils::FilePath, ProjectExplorer::
CMakeTargetNode *tNode = createTargetNode(cmakeListsNodes, t->sourceDirectory, t->name);
QTC_ASSERT(tNode, qDebug() << "No target node for" << t->sourceDirectory << t->name; continue);
tNode->setTargetInformation(t->artifacts, t->type);
tNode->setBuildDirectory(t->buildDirectory);
QList<FolderNode::LocationInfo> info;
// Set up a default target path:
FilePath targetPath = t->sourceDirectory.pathAppended("CMakeLists.txt");