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

Merge commit 'fred/cmake-build-directory'

Browse Source
This commit is contained in:
dt
2009-01-16 13:48:06 +01:00
parent ad2fd37b85 297bdb3c05
commit f52a012924
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,9 +80,9 @@ CMakeProject::~CMakeProject()
// TODO make this function work even if it is reparsing // TODO make this function work even if it is reparsing
void CMakeProject::parseCMakeLists(const QDir &directory) void CMakeProject::parseCMakeLists(const QDir &directory)
{ {
createCbpFile(directory); createCbpFile(buildDirectory(QString()));
QString cbpFile = findCbpFile(directory); QString cbpFile = findCbpFile(buildDirectory(QString()));
CMakeCbpParser cbpparser; CMakeCbpParser cbpparser;
qDebug()<<"Parsing file "<<cbpFile; qDebug()<<"Parsing file "<<cbpFile;
@@ -153,9 +153,10 @@ void CMakeProject::createCbpFile(const QDir &directory)
// TODO we need to pass on the same paremeters as the cmakestep // TODO we need to pass on the same paremeters as the cmakestep
qDebug()<<"Creating cbp file"; qDebug()<<"Creating cbp file";
directory.mkpath(directory.absolutePath());
QProcess cmake; QProcess cmake;
cmake.setWorkingDirectory(directory.absolutePath()); cmake.setWorkingDirectory(directory.absolutePath());
cmake.start("cmake", QStringList() << "-GCodeBlocks - Unix Makefiles"); cmake.start("cmake", QStringList() << ".." << "-GCodeBlocks - Unix Makefiles");
cmake.waitForFinished(-1); cmake.waitForFinished(-1);
qDebug()<<"cmake output: \n"<<cmake.readAll(); qDebug()<<"cmake output: \n"<<cmake.readAll();
} }
@@ -240,7 +241,7 @@ QString CMakeProject::buildDirectory(const QString &buildConfiguration) const
{ {
QString buildDirectory = value(buildConfiguration, "buildDirectory").toString(); QString buildDirectory = value(buildConfiguration, "buildDirectory").toString();
if (buildDirectory.isEmpty()) if (buildDirectory.isEmpty())
buildDirectory = QFileInfo(m_fileName).absolutePath(); buildDirectory = QFileInfo(m_fileName).absolutePath() + "/qtcreator-build";
return buildDirectory; return buildDirectory;
} }