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

CMake: Use default build directory

Browse Source 
Change-Id: Ic7916c1ebe0f58ec61d47f1b87891263cce0f6c5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2012-11-19 14:18:14 +01:00
parent 1c4d51ef7a
commit cb02dd812a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,9 +52,12 @@
#include <cpptools/ModelManagerInterface.h>
#include <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <coreplugin/icore.h>
#include <coreplugin/infobar.h>
#include <coreplugin/documentmanager.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/variablemanager.h>
#include <QMap>
#include <QDebug>
@@ -194,7 +197,8 @@ void CMakeProject::changeBuildDirectory(CMakeBuildConfiguration *bc, const QStri
QString CMakeProject::defaultBuildDirectory() const
{
return projectDirectory() + QLatin1String("-build");
return Utils::expandMacros(Core::DocumentManager::instance()->buildDirectory(),
Core::VariableManager::instance()->macroExpander());
}
bool CMakeProject::parseCMakeLists()