[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1194-g00f3126

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  00f312620763c28e2d1a2789979183de9448e94c (commit)
       via  7fa0f4b8703e08e958336b66f1b4f7db94ef4001 (commit)
       via  538af1642561565f6d2674430005bb5dd6370ebb (commit)
       via  cb15efc370f935aa23e9cc597bf04948ed6907ae (commit)
       via  6e58a4c714d16ebc48090689820838e08d4a1151 (commit)
      from  11f9de8df99376e5ae103e19efd334735da22f58 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00f312620763c28e2d1a2789979183de9448e94c
commit 00f312620763c28e2d1a2789979183de9448e94c
Merge: 11f9de8 7fa0f4b
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Dec 3 14:04:34 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 3 14:04:34 2012 -0500

    Merge topic 'fix-13770-folders-w-vs11-express' into next
    
    7fa0f4b VS11: Allow using folders with the VS11 Express Edition (#13770)
    538af16 CMake Nightly Date Stamp
    cb15efc CMake Nightly Date Stamp
    6e58a4c CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7fa0f4b8703e08e958336b66f1b4f7db94ef4001
commit 7fa0f4b8703e08e958336b66f1b4f7db94ef4001
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Dec 3 13:53:43 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Dec 3 13:53:43 2012 -0500

    VS11: Allow using folders with the VS11 Express Edition (#13770)
    
    Solution folders are supported as read-only in the VS11 Express
    Edition, so do not prohibit their use just because we detect the
    express edition (as we did in the VS10 generator).
    
    Inspired-by: Paris

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 154e629..0f439e9 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -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;
 }
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx
index ba30e18..b6d7d04 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -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();
+}
diff --git a/Source/cmGlobalVisualStudio11Generator.h b/Source/cmGlobalVisualStudio11Generator.h
index 8898c5d..174f1cc 100644
--- a/Source/cmGlobalVisualStudio11Generator.h
+++ b/Source/cmGlobalVisualStudio11Generator.h
@@ -33,6 +33,7 @@ public:
   virtual std::string GetUserMacrosDirectory() { return ""; }
 protected:
   virtual const char* GetIDEVersion() { return "11.0"; }
+  bool UseFolderProperty();
 private:
   class Factory;
 };

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake                  |    2 +-
 Source/cmGlobalGenerator.cxx               |    2 +-
 Source/cmGlobalVisualStudio11Generator.cxx |    9 +++++++++
 Source/cmGlobalVisualStudio11Generator.h   |    1 +
 4 files changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake