diff options
| author | David Cole <david.cole@kitware.com> | 2012-06-05 14:21:28 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-06-05 14:21:28 -0400 |
| commit | 80abbeb3f2fe1cd245633e6ac52caa329f37ae52 (patch) | |
| tree | ff9adba2edcae426859575be3fc93494ac022caa | |
| parent | 364b62747b0707a2152281173087630c904a9053 (diff) | |
| parent | a0700ba26c5e26bfc514121a14688731a3cd0445 (diff) | |
| download | cmake-80abbeb3f2fe1cd245633e6ac52caa329f37ae52.tar.gz | |
Merge topic 'vcexpress-no-folder'
a0700ba VC Express doesn't support folders, ignore USE_FOLDER property
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.h | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 18a786d78f..947a1c99de 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -278,3 +278,9 @@ void cmGlobalVisualStudio10Generator::PathTooLong( this->LongestSource.SourceRel = sfRel; } } + +//---------------------------------------------------------------------------- +bool cmGlobalVisualStudio10Generator::UseFolderProperty() +{ + return IsExpressEdition() ? false : cmGlobalGenerator::UseFolderProperty(); +} diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index 4236563523..060cdfff34 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -88,6 +88,9 @@ protected: std::string PlatformToolset; bool ExpressEdition; + + bool UseFolderProperty(); + private: struct LongestSourcePath { |