Differential D18202 Diff 49304 plugins/meson/mesonmanager.cpp

Changeset View

Standalone View

View Options

plugins/meson/mesonmanager.cpp

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Line(s)119{
123 if (!newBD.exec() || !newBD.isConfigValid()) { 123​ if (!newBD.exec() || !newBD.isConfigValid()) {
124 qCWarning(KDEV_Meson) << "Failed to create new build directory for project " << project->name(); 124​ qCWarning(KDEV_Meson) << "Failed to create new build directory for project " << project->name();
125 return Meson::BuildDir(); 125​ return Meson::BuildDir();
126 } 126​ }
127 127​
128 Meson::BuildDir buildDir = newBD.currentConfig(); 128​ Meson::BuildDir buildDir = newBD.currentConfig();
129 Meson::MesonConfig mesonCfg = Meson::getMesonConfig(project); 129​ Meson::MesonConfig mesonCfg = Meson::getMesonConfig(project);
130 buildDir.canonicalizePaths(); 130​ buildDir.canonicalizePaths();
131 mesonCfg.addBuildDir(buildDir); 131​ mesonCfg.currentIndex = mesonCfg.addBuildDir(buildDir);
132 Meson::writeMesonConfig(project, mesonCfg); 132​ Meson::writeMesonConfig(project, mesonCfg);
133 133​
134​ m_builder->configure(project, buildDir, newBD.mesonArgs())->start();
134 return buildDir; 135​ return buildDir;
135} 136​}
136 137​
137QStringList MesonManager::supportedMesonBackends() const 138​QStringList MesonManager::supportedMesonBackends() const
138{ 139​{
139 // Maybe add support for other generators 140​ // Maybe add support for other generators
140 return { GENERATOR_NINJA }; 141​ return { GENERATOR_NINJA };
141} 142​}
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines