From ea2c57257c3a2d895d5475d0f8d4c00efa12850b Mon Sep 17 00:00:00 2001
From: Fred Emmott <mail@fredemmott.co.uk>
Date: Thu, 15 Jan 2009 19:20:36 +0000
Subject: [PATCH 1/2] Run the project cmake command in a ./qtcreator-build
 directory.

---
 src/plugins/cmakeprojectmanager/cmakeproject.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index d98539969af..d38e5a30825 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -80,9 +80,10 @@ CMakeProject::~CMakeProject()
 // TODO make this function work even if it is reparsing
 void CMakeProject::parseCMakeLists(const QDir &directory)
 {
-    createCbpFile(directory);
+    QDir buildDirectory(directory.absolutePath() + "/qtcreator-build");
+    createCbpFile(buildDirectory);
 
-    QString cbpFile = findCbpFile(directory);
+    QString cbpFile = findCbpFile(buildDirectory);
 
     CMakeCbpParser cbpparser;
     qDebug()<<"Parsing file "<<cbpFile;
@@ -152,9 +153,10 @@ void CMakeProject::createCbpFile(const QDir &directory)
 
     // TODO we need to pass on the same paremeters as the cmakestep
     qDebug()<<"Creating cbp file";
+    directory.mkpath(directory.absolutePath());
     QProcess cmake;
     cmake.setWorkingDirectory(directory.absolutePath());
-    cmake.start("cmake", QStringList() << "-GCodeBlocks - Unix Makefiles");
+    cmake.start("cmake", QStringList() << ".." << "-GCodeBlocks - Unix Makefiles");
     cmake.waitForFinished(-1);
     qDebug()<<"cmake output: \n"<<cmake.readAll();
 }

From 297bdb3c05c98d510e260a7fede9309cbd1ebc6d Mon Sep 17 00:00:00 2001
From: Fred Emmott <mail@fredemmott.co.uk>
Date: Thu, 15 Jan 2009 19:29:42 +0000
Subject: [PATCH 2/2] Run all commands in ./qtcreator-build/ when using the
 CMake plugin. - avoid polution of the source. - required for KDE apps.

---
 src/plugins/cmakeprojectmanager/cmakeproject.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index d38e5a30825..bd3d7322898 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -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;
 }