Differential D7762 Diff 19377 projectmanagers/cmake/cmakeutils.cpp

Changeset View

Standalone View

View Options

projectmanagers/cmake/cmakeutils.cpp

Context not available.
54namespace Old 54​namespace Old
55{ 55​{
56static const QString currentBuildDirKey = QStringLiteral("CurrentBuildDir"); 56​static const QString currentBuildDirKey = QStringLiteral("CurrentBuildDir");
57​static const QString oldcmakeExecutableKey = QStringLiteral("CMake Binary"); // Todo: Remove at some point
57static const QString currentBuildTypeKey = QStringLiteral("CurrentBuildType"); 58​static const QString currentBuildTypeKey = QStringLiteral("CurrentBuildType");
58static const QString currentInstallDirKey = QStringLiteral("CurrentInstallDir"); 59​static const QString currentInstallDirKey = QStringLiteral("CurrentInstallDir");
59static const QString currentEnvironmentKey = QStringLiteral("CurrentEnvironment"); 60​static const QString currentEnvironmentKey = QStringLiteral("CurrentEnvironment");
Context not available.
75namespace Specific 76​namespace Specific
76{ 77​{
77static const QString buildDirPathKey = QStringLiteral("Build Directory Path"); 78​static const QString buildDirPathKey = QStringLiteral("Build Directory Path");
78// TODO: migrate to more generic & consistent key term "CMake Executable" 79​static const QString cmakeExecutableKey = QStringLiteral("CMake Executable");
79static const QString cmakeBuildTypeKey = QStringLiteral("Build Type"); 80​static const QString cmakeBuildTypeKey = QStringLiteral("Build Type");
80static const QString cmakeInstallDirKey = QStringLiteral("Install Directory"); 81​static const QString cmakeInstallDirKey = QStringLiteral("Install Directory");
81static const QString cmakeEnvironmentKey = QStringLiteral("Environment Profile"); 82​static const QString cmakeEnvironmentKey = QStringLiteral("Environment Profile");
Context not available.
352 return readBuildDirParameter( project, Config::Specific::cmakeArgumentsKey, QString(), builddir ); 353​ return readBuildDirParameter( project, Config::Specific::cmakeArgumentsKey, QString(), builddir );
353} 354​}
354 355​
356​QString currentCmakeExecutable( KDevelop::IProject* project, int builddir )
357​{
358​ return readBuildDirParameter( project, Config::Specific::cmakeExecutableKey, QString(), builddir );
359​}
360​
355void setCurrentInstallDir( KDevelop::IProject* project, const KDevelop::Path& path ) 361​void setCurrentInstallDir( KDevelop::IProject* project, const KDevelop::Path& path )
356{ 362​{
357 writeBuildDirParameter( project, Config::Specific::cmakeInstallDirKey, path.toLocalFile() ); 363​ writeBuildDirParameter( project, Config::Specific::cmakeInstallDirKey, path.toLocalFile() );
Context not available.
377 writeBuildDirParameter( project, Config::Specific::cmakeArgumentsKey, string ); 383​ writeBuildDirParameter( project, Config::Specific::cmakeArgumentsKey, string );
378} 384​}
379 385​
386​void setCurrentCmakeExecutable( KDevelop::IProject* project, const QString& string )
387​{
388​ writeBuildDirParameter( project, Config::Specific::cmakeExecutableKey, string );
389​}
390​
380QString currentEnvironment(KDevelop::IProject* project, int builddir) 391​QString currentEnvironment(KDevelop::IProject* project, int builddir)
381{ 392​{
382 return readBuildDirParameter( project, Config::Specific::cmakeEnvironmentKey, QString(), builddir ); 393​ return readBuildDirParameter( project, Config::Specific::cmakeEnvironmentKey, QString(), builddir );
Context not available.