VS: Ignore USE_FOLDER property on VS versions that do not support it
Solution folders are supported on VS 8 and above in the full versions and on VS 11 and above in the express versions.
This commit is contained in:
parent
0c58d2d0fd
commit
571bedec29
|
@ -608,12 +608,6 @@ void cmGlobalVisualStudio10Generator::PathTooLong(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
|
||||||
bool cmGlobalVisualStudio10Generator::UseFolderProperty()
|
|
||||||
{
|
|
||||||
return IsExpressEdition() ? false : cmGlobalGenerator::UseFolderProperty();
|
|
||||||
}
|
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
bool cmGlobalVisualStudio10Generator::IsNsightTegra() const
|
bool cmGlobalVisualStudio10Generator::IsNsightTegra() const
|
||||||
{
|
{
|
||||||
|
|
|
@ -127,8 +127,6 @@ protected:
|
||||||
bool SystemIsWindowsPhone;
|
bool SystemIsWindowsPhone;
|
||||||
bool SystemIsWindowsStore;
|
bool SystemIsWindowsStore;
|
||||||
|
|
||||||
bool UseFolderProperty();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
class Factory;
|
class Factory;
|
||||||
struct LongestSourcePath
|
struct LongestSourcePath
|
||||||
|
|
|
@ -239,10 +239,10 @@ void cmGlobalVisualStudio11Generator::WriteSLNHeader(std::ostream& fout)
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
bool cmGlobalVisualStudio11Generator::UseFolderProperty()
|
bool cmGlobalVisualStudio11Generator::UseFolderProperty()
|
||||||
{
|
{
|
||||||
// Intentionally skip over the parent class implementation and call the
|
// Intentionally skip up to the top-level class implementation.
|
||||||
// grand-parent class's implementation. Folders are not supported by the
|
// Folders are not supported by the Express editions in VS10 and earlier,
|
||||||
// Express editions in VS10 and earlier, but they are in VS11 Express.
|
// but they are in VS11 Express and above.
|
||||||
return cmGlobalVisualStudio8Generator::UseFolderProperty();
|
return cmGlobalGenerator::UseFolderProperty();
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
|
@ -75,6 +75,9 @@ protected:
|
||||||
const std::set<std::string>& depends);
|
const std::set<std::string>& depends);
|
||||||
virtual void WriteSLNHeader(std::ostream& fout);
|
virtual void WriteSLNHeader(std::ostream& fout);
|
||||||
|
|
||||||
|
// Folders are not supported by VS 7.1.
|
||||||
|
virtual bool UseFolderProperty() { return false; }
|
||||||
|
|
||||||
std::string ProjectConfigurationSectionName;
|
std::string ProjectConfigurationSectionName;
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -193,6 +193,12 @@ void cmGlobalVisualStudio8Generator::Configure()
|
||||||
this->cmGlobalVisualStudio7Generator::Configure();
|
this->cmGlobalVisualStudio7Generator::Configure();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//----------------------------------------------------------------------------
|
||||||
|
bool cmGlobalVisualStudio8Generator::UseFolderProperty()
|
||||||
|
{
|
||||||
|
return IsExpressEdition() ? false : cmGlobalGenerator::UseFolderProperty();
|
||||||
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
std::string cmGlobalVisualStudio8Generator::GetUserMacrosDirectory()
|
std::string cmGlobalVisualStudio8Generator::GetUserMacrosDirectory()
|
||||||
{
|
{
|
||||||
|
|
|
@ -97,6 +97,8 @@ protected:
|
||||||
const char* path,
|
const char* path,
|
||||||
const cmGeneratorTarget *t);
|
const cmGeneratorTarget *t);
|
||||||
|
|
||||||
|
bool UseFolderProperty();
|
||||||
|
|
||||||
std::string Name;
|
std::string Name;
|
||||||
std::string WindowsCEVersion;
|
std::string WindowsCEVersion;
|
||||||
bool ExpressEdition;
|
bool ExpressEdition;
|
||||||
|
|
|
@ -92,7 +92,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
|
||||||
//
|
//
|
||||||
// Organize in the "predefined targets" folder:
|
// Organize in the "predefined targets" folder:
|
||||||
//
|
//
|
||||||
if (this->UseFolderProperty() && this->GetVersion() > VS71)
|
if (this->UseFolderProperty())
|
||||||
{
|
{
|
||||||
allBuild->SetProperty("FOLDER", this->GetPredefinedTargetsFolder());
|
allBuild->SetProperty("FOLDER", this->GetPredefinedTargetsFolder());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue