Commit 297bdb3c authored by Fred Emmott's avatar Fred Emmott
Browse files

Run all commands in ./qtcreator-build/ when using the CMake plugin.

- avoid polution of the source.
- required for KDE apps.
parent ea2c5725
......@@ -80,10 +80,9 @@ CMakeProject::~CMakeProject()
// TODO make this function work even if it is reparsing
void CMakeProject::parseCMakeLists(const QDir &directory)
{
QDir buildDirectory(directory.absolutePath() + "/qtcreator-build");
createCbpFile(buildDirectory);
createCbpFile(buildDirectory(QString()));
QString cbpFile = findCbpFile(buildDirectory);
QString cbpFile = findCbpFile(buildDirectory(QString()));
CMakeCbpParser cbpparser;
qDebug()<<"Parsing file "<<cbpFile;
......@@ -242,7 +241,7 @@ QString CMakeProject::buildDirectory(const QString &buildConfiguration) const
{
QString buildDirectory = value(buildConfiguration, "buildDirectory").toString();
if (buildDirectory.isEmpty())
buildDirectory = QFileInfo(m_fileName).absolutePath();
buildDirectory = QFileInfo(m_fileName).absolutePath() + "/qtcreator-build";
return buildDirectory;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment