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

Set BUILDDIR and SOURCEDIR environment variables

Browse Source 
Set BUILDDIR and SOURCEDIR in the build environment.

Reviewed-by: dt
This commit is contained in:
Tobias Hunger
2010-09-22 15:14:07 +02:00
parent 27ded2076e
commit 747f750370
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,10 +76,15 @@ QVariantMap CMakeBuildConfiguration::toMap() const
bool CMakeBuildConfiguration::fromMap(const QVariantMap &map)
{
if (!BuildConfiguration::fromMap(map))
return false;
m_msvcVersion = map.value(QLatin1String(MSVC_VERSION_KEY)).toString();
m_buildDirectory = map.value(QLatin1String(BUILD_DIRECTORY_KEY), cmakeTarget()->defaultBuildDirectory()).toString();
return BuildConfiguration::fromMap(map);
environment().set("BUILDDIR", m_buildDirectory);
return true;
}
CMakeBuildConfiguration::~CMakeBuildConfiguration()
@@ -137,7 +142,9 @@ void CMakeBuildConfiguration::setBuildDirectory(const QString &buildDirectory)
if (m_buildDirectory == buildDirectory)
return;
m_buildDirectory = buildDirectory;
environment().set("BUILDDIR", m_buildDirectory);
emit buildDirectoryChanged();
emit environmentChanged();
}
QString CMakeBuildConfiguration::msvcVersion() const