Commit 41fe73a6 authored by David Cole's avatar David Cole Committed by Kitware Robot

Merge topic 'fix-13770-folders-w-vs11-express'

7fa0f4b8 VS11: Allow using folders with the VS11 Express Edition (#13770)
parents 7b910c00 7fa0f4b8
......@@ -2047,7 +2047,7 @@ bool cmGlobalGenerator::UseFolderProperty()
}
// By default, this feature is OFF, since it is not supported in the
// Visual Studio Express editions:
// Visual Studio Express editions until VS11:
//
return false;
}
......
......@@ -93,3 +93,12 @@ cmLocalGenerator *cmGlobalVisualStudio11Generator::CreateLocalGenerator()
lg->SetGlobalGenerator(this);
return lg;
}
//----------------------------------------------------------------------------
bool cmGlobalVisualStudio11Generator::UseFolderProperty()
{
// Intentionally skip over the parent class implementation and call the
// grand-parent class's implementation. Folders are not supported by the
// Express editions in VS10 and earlier, but they are in VS11 Express.
return cmGlobalVisualStudio8Generator::UseFolderProperty();
}
......@@ -33,6 +33,7 @@ public:
virtual std::string GetUserMacrosDirectory() { return ""; }
protected:
virtual const char* GetIDEVersion() { return "11.0"; }
bool UseFolderProperty();
private:
class Factory;
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment