mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-29 04:09:35 +03:00
Code Activity

cmQTWrapUICommand: Port away from cmCommand

Browse Source 
Ref: #19499
This commit is contained in:
Regina Pfeifer
2019-09-12 18:16:17 +02:00
parent 56bfb8de5d
commit 7f86990262
3 changed files with 32 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmCommands.cxx
+1 -1
View File
@@ -290,7 +290,7 @@ void GetProjectCommands(cmState* state)
state->AddBuiltinCommand("load_cache",
cm::make_unique<cmLoadCacheCommand>());
state->AddBuiltinCommand("qt_wrap_cpp", cmQTWrapCPPCommand);
state->AddBuiltinCommand("qt_wrap_ui", cm::make_unique<cmQTWrapUICommand>());
state->AddBuiltinCommand("qt_wrap_ui", cmQTWrapUICommand);
state->AddBuiltinCommand("remove_definitions",
cm::make_unique<cmRemoveDefinitionsCommand>());
state->AddBuiltinCommand("source_group",
Source/cmQTWrapUICommand.cxx
+29 -34
View File
@@ -2,52 +2,50 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmQTWrapUICommand.h"
#include <utility>
#include "cmCustomCommandLines.h"
#include "cmExecutionStatus.h"
#include "cmMakefile.h"
#include "cmRange.h"
#include "cmSourceFile.h"
#include "cmStringAlgorithms.h"
#include "cmSystemTools.h"
#include <utility>
class cmExecutionStatus;
// cmQTWrapUICommand
bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& args,
cmExecutionStatus&)
bool cmQTWrapUICommand(std::vector<std::string> const& args,
cmExecutionStatus& status)
{
if (args.size() < 4) {
this->SetError("called with incorrect number of arguments");
status.SetError("called with incorrect number of arguments");
return false;
}
cmMakefile& mf = status.GetMakefile();
// Get the uic and moc executables to run in the custom commands.
std::string const& uic_exe =
this->Makefile->GetRequiredDefinition("QT_UIC_EXECUTABLE");
std::string const& moc_exe =
this->Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE");
std::string const& uic_exe = mf.GetRequiredDefinition("QT_UIC_EXECUTABLE");
std::string const& moc_exe = mf.GetRequiredDefinition("QT_MOC_EXECUTABLE");
// Get the variable holding the list of sources.
std::string const& headerList = args[1];
std::string const& sourceList = args[2];
std::string headerListValue = this->Makefile->GetSafeDefinition(headerList);
std::string sourceListValue = this->Makefile->GetSafeDefinition(sourceList);
std::string headerListValue = mf.GetSafeDefinition(headerList);
std::string sourceListValue = mf.GetSafeDefinition(sourceList);
// Create rules for all sources listed.
for (std::string const& arg : cmMakeRange(args).advance(3)) {
cmSourceFile* curr = this->Makefile->GetSource(arg);
cmSourceFile* curr = mf.GetSource(arg);
// if we should wrap the class
if (!(curr && curr->GetPropertyAsBool("WRAP_EXCLUDE"))) {
// Compute the name of the files to generate.
std::string srcName =
cmSystemTools::GetFilenameWithoutLastExtension(arg);
std::string hName = cmStrCat(this->Makefile->GetCurrentBinaryDirectory(),
'/', srcName, ".h");
std::string cxxName = cmStrCat(
this->Makefile->GetCurrentBinaryDirectory(), '/', srcName, ".cxx");
std::string mocName = cmStrCat(
this->Makefile->GetCurrentBinaryDirectory(), "/moc_", srcName, ".cxx");
std::string hName =
cmStrCat(mf.GetCurrentBinaryDirectory(), '/', srcName, ".h");
std::string cxxName =
cmStrCat(mf.GetCurrentBinaryDirectory(), '/', srcName, ".cxx");
std::string mocName =
cmStrCat(mf.GetCurrentBinaryDirectory(), "/moc_", srcName, ".cxx");
// Compute the name of the ui file from which to generate others.
std::string uiName;
@@ -55,9 +53,9 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& args,
uiName = arg;
} else {
if (curr && curr->GetIsGenerated()) {
uiName = this->Makefile->GetCurrentBinaryDirectory();
uiName = mf.GetCurrentBinaryDirectory();
} else {
uiName = this->Makefile->GetCurrentSourceDirectory();
uiName = mf.GetCurrentSourceDirectory();
}
uiName += "/";
uiName += arg;
@@ -109,25 +107,22 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& args,
std::string no_main_dependency;
const char* no_comment = nullptr;
const char* no_working_dir = nullptr;
this->Makefile->AddCustomCommandToOutput(
hName, depends, no_main_dependency, hCommandLines, no_comment,
no_working_dir);
mf.AddCustomCommandToOutput(hName, depends, no_main_dependency,
hCommandLines, no_comment, no_working_dir);
depends.push_back(hName);
this->Makefile->AddCustomCommandToOutput(
cxxName, depends, no_main_dependency, cxxCommandLines, no_comment,
no_working_dir);
mf.AddCustomCommandToOutput(cxxName, depends, no_main_dependency,
cxxCommandLines, no_comment, no_working_dir);
depends.clear();
depends.push_back(hName);
this->Makefile->AddCustomCommandToOutput(
mocName, depends, no_main_dependency, mocCommandLines, no_comment,
no_working_dir);
mf.AddCustomCommandToOutput(mocName, depends, no_main_dependency,
mocCommandLines, no_comment, no_working_dir);
}
}
// Store the final list of source files and headers.
this->Makefile->AddDefinition(sourceList, sourceListValue);
this->Makefile->AddDefinition(headerList, headerListValue);
mf.AddDefinition(sourceList, sourceListValue);
mf.AddDefinition(headerList, headerListValue);
return true;
}
Source/cmQTWrapUICommand.h
+2 -27
View File
@@ -8,34 +8,9 @@
#include <string>
#include <vector>
#include "cm_memory.hxx"
#include "cmCommand.h"
class cmExecutionStatus;
/** \class cmQTWrapUICommand
* \brief Create .h and .cxx files rules for Qt user interfaces files
*
* cmQTWrapUICommand is used to create wrappers for Qt classes into normal C++
*/
class cmQTWrapUICommand : public cmCommand
{
public:
/**
* This is a virtual constructor for the command.
*/
std::unique_ptr<cmCommand> Clone() override
{
return cm::make_unique<cmQTWrapUICommand>();
}
/**
* This is called when the command is first encountered in
* the CMakeLists.txt file.
*/
bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus& status) override;
};
bool cmQTWrapUICommand(std::vector<std::string> const& args,
cmExecutionStatus& status);
#endif