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

Make msvc and cmake play together.

Browse Source 
Note: This requires a cvs cmake and is not fully tested yet. This adds a
few missing pieces, so now opening new never built projects without a
.user file on systems with just one VS installation should work.
This commit is contained in:
dt
2009-07-02 16:44:51 +02:00
parent 560b06391d
commit 40ff6ab2c4
6 changed files with 76 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/makestep.cpp
View File

@@ -57,11 +57,8 @@ bool MakeStep::init(const QString &buildConfiguration)
setEnabled(buildConfiguration, true);
setWorkingDirectory(buildConfiguration, m_pro->buildDirectory(buildConfiguration));
#ifdef Q_OS_WIN
setCommand(buildConfiguration, "mingw32-make");
#else // Q_OS_WIN
setCommand(buildConfiguration, "make"); // TODO give full path here?
#endif // Q_OS_WIN
setCommand(buildConfiguration, m_pro->toolChain(buildConfiguration)->makeCommand());
if (!value(buildConfiguration, "cleanConfig").isValid() &&value("clean").isValid() && value("clean").toBool()) {
// Import old settings