Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Tobias Hunger
qt-creator
Commits
0a406dbe
Commit
0a406dbe
authored
Apr 07, 2009
by
dt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a makestep that cleans up
Make clean and rebuild all work.
parent
3d863b21
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
src/plugins/cmakeprojectmanager/cmakeproject.cpp
src/plugins/cmakeprojectmanager/cmakeproject.cpp
+4
-0
src/plugins/cmakeprojectmanager/makestep.cpp
src/plugins/cmakeprojectmanager/makestep.cpp
+8
-4
No files found.
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View file @
0a406dbe
...
...
@@ -506,6 +506,10 @@ void CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
if
(
!
copw
.
buildDirectory
().
isEmpty
())
setValue
(
"all"
,
"buildDirectory"
,
copw
.
buildDirectory
());
//TODO save arguments somewhere copw.arguments()
MakeStep
*
cleanMakeStep
=
new
MakeStep
(
this
);
insertCleanStep
(
0
,
cleanMakeStep
);
cleanMakeStep
->
setValue
(
"clean"
,
true
);
}
else
{
// We have a user file, but we could still be missing the cbp file
// TODO check that we have a cbp file and if not, open up a dialog ?
...
...
src/plugins/cmakeprojectmanager/makestep.cpp
View file @
0a406dbe
...
...
@@ -99,10 +99,14 @@ bool MakeStep::init(const QString &buildConfiguration)
setCommand
(
buildConfiguration
,
"make"
);
// TODO give full path here?
#endif // Q_OS_WIN
QStringList
arguments
=
value
(
buildConfiguration
,
"buildTargets"
).
toStringList
();
arguments
<<
additionalArguments
(
buildConfiguration
);
setArguments
(
buildConfiguration
,
arguments
);
// TODO
setEnvironment
(
buildConfiguration
,
m_pro
->
environment
(
buildConfiguration
));
if
(
value
(
"clean"
).
isValid
()
&&
value
(
"clean"
).
toBool
())
{
setArguments
(
buildConfiguration
,
QStringList
()
<<
"clean"
);
}
else
{
QStringList
arguments
=
value
(
buildConfiguration
,
"buildTargets"
).
toStringList
();
arguments
<<
additionalArguments
(
buildConfiguration
);
setArguments
(
buildConfiguration
,
arguments
);
// TODO
setEnvironment
(
buildConfiguration
,
m_pro
->
environment
(
buildConfiguration
));
}
return
AbstractProcessStep
::
init
(
buildConfiguration
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment