feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
- avoid polution of the source.
- required for KDE apps.
This commit is contained in:
Fred Emmott
2009-01-15 19:29:42 +00:00
parent ea2c57257c
commit 297bdb3c05
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -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;
}