[Cmake-commits] CMake branch, next, updated. v2.8.8-2972-g5c1d4ff

[Peter Kuemmel]

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  5c1d4ffa7be6ad14590b10975a10fb330a4e3696 (commit)
       via  a0700ba26c5e26bfc514121a14688731a3cd0445 (commit)
       via  076ab5202a631ac7c8fd6bc84554834ddff57933 (commit)
       via  e200ee6ece3d0345804f8eb94fbda2bd5df9272f (commit)
      from  a6e18a05b00d8dc73e72fd1e48b364f2b88d98a6 (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=5c1d4ffa7be6ad14590b10975a10fb330a4e3696
commit 5c1d4ffa7be6ad14590b10975a10fb330a4e3696
Merge: a6e18a0 a0700ba
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Jun 2 14:07:32 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jun 2 14:07:32 2012 -0400

    Merge topic 'vcexpress-no-folder' into next
    
    a0700ba VC Express doesn't support folders, ignore USE_FOLDER property
    076ab52 CMake Nightly Date Stamp
    e200ee6 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0700ba26c5e26bfc514121a14688731a3cd0445
commit a0700ba26c5e26bfc514121a14688731a3cd0445
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sat Jun 2 19:58:03 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Sat Jun 2 19:58:03 2012 +0200

    VC Express doesn't support folders, ignore USE_FOLDER property

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 18a786d..947a1c9 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 4236563..060cdff 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -88,6 +88,9 @@ protected:
 
   std::string PlatformToolset;
   bool ExpressEdition;
+
+  bool UseFolderProperty();
+
 private:
   struct LongestSourcePath
   {

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

Summary of changes:
 Source/CMakeVersion.cmake                  |    2 +-
 Source/cmGlobalVisualStudio10Generator.cxx |    6 ++++++
 Source/cmGlobalVisualStudio10Generator.h   |    3 +++
 3 files changed, 10 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake