Skip to content

Commit 7aeb745

Browse files
christianrauchchristian-rauch
authored andcommitted
remove deprecated CodeBlocks "extra" generator from colcon
1 parent 4bf4de5 commit 7aeb745

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/project_manager/ros_colcon_step.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ QString ROSColconStep::allArguments(ROSUtils::BuildType buildType, bool includeD
173173
args << "--event-handlers status+ console_start_end+";
174174
if (includeDefault)
175175
if (buildType == ROSUtils::BuildTypeUserDefined)
176-
args << QString("--cmake-args -G \"CodeBlocks - Unix Makefiles\" %1").arg(m_cmakeArguments);
176+
args << QString("--cmake-args %1").arg(m_cmakeArguments);
177177
else
178-
args << QString("--cmake-args -G \"CodeBlocks - Unix Makefiles\" %1 %2").arg(ROSUtils::getCMakeBuildTypeArgument(buildType), m_cmakeArguments);
178+
args << QString("--cmake-args %1 %2").arg(ROSUtils::getCMakeBuildTypeArgument(buildType), m_cmakeArguments);
179179
else
180180
if (!m_cmakeArguments.isEmpty())
181181
args << QString("--cmake-args %1").arg(m_cmakeArguments);

src/project_manager/ros_utils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ bool ROSUtils::buildWorkspace(QProcess &process, const WorkspaceInfo &workspaceI
260260
case Colcon:
261261
{
262262
process.setWorkingDirectory(workspaceInfo.path.toFSPathString());
263-
process.start(QLatin1String("bash"), QStringList() << QLatin1String("-c") << QLatin1String("colcon build --cmake-args -G \"CodeBlocks - Unix Makefiles\""));
263+
process.start(QLatin1String("bash"), QStringList() << QLatin1String("-c") << QLatin1String("colcon build"));
264264
process.waitForFinished();
265265
break;
266266
}

0 commit comments

Comments
 (0)