[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2966-gf3263d3

[Brad King]

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  f3263d38c4c7961f60612294b9c0bc7a9d150b06 (commit)
       via  42bb42d19723323e6e48346b1437e04a251addfa (commit)
      from  e0d897c57be57b4a68fcfa377f3321bd7c5c20f1 (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=f3263d38c4c7961f60612294b9c0bc7a9d150b06
commit f3263d38c4c7961f60612294b9c0bc7a9d150b06
Merge: e0d897c 42bb42d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 14 09:48:25 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 14 09:48:25 2013 -0400

    Merge topic 'vs-configurations' into next
    
    42bb42d VS: Always initialize CMAKE_CONFIGURATION_TYPES in IDE generators


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42bb42d19723323e6e48346b1437e04a251addfa
commit 42bb42d19723323e6e48346b1437e04a251addfa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 13 11:01:17 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 13 11:07:46 2013 -0400

    VS: Always initialize CMAKE_CONFIGURATION_TYPES in IDE generators
    
    Initialize the CMAKE_CONFIGURATION_TYPES cache entry early during
    EnableLanguage like the Xcode generator does.  Avoid depending on
    the MSVC compiler information module to do it.  Otherwise code like
    
      project(MyProj NONE)
    
    sets CMAKE_CONFIGURATION_TYPES late (in GenerateConfigurations), and
    to only "Debug" and "Release" instead of the standard set of 4.
    
    Reported-by: Paul Smith <paul at mad-scientist.net>

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index f9df6d8..8682e2d 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -52,9 +52,6 @@ if(CMAKE_GENERATOR MATCHES "Visual Studio 6")
 endif()
 if(NOT CMAKE_NO_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio")
   set (CMAKE_NO_BUILD_TYPE 1)
-  set (CMAKE_CONFIGURATION_TYPES "Debug;Release;MinSizeRel;RelWithDebInfo" CACHE STRING
-     "Semicolon separated list of supported configuration types, only supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything else will be ignored.")
-  mark_as_advanced(CMAKE_CONFIGURATION_TYPES)
 endif()
 
 # make sure to enable languages after setting configuration types
diff --git a/Modules/Platform/Windows-df.cmake b/Modules/Platform/Windows-df.cmake
index 7e2ac9f..8dfb610 100644
--- a/Modules/Platform/Windows-df.cmake
+++ b/Modules/Platform/Windows-df.cmake
@@ -38,8 +38,6 @@ if(CMAKE_GENERATOR MATCHES "Visual Studio 6")
 endif()
 if(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visual Studio 8")
   set (CMAKE_NO_BUILD_TYPE 1)
-  set (CMAKE_CONFIGURATION_TYPES "Debug;Release;MinSizeRel;RelWithDebInfo" CACHE STRING
-     "Semicolon separated list of supported configuration types, only supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything else will be ignored.")
 endif()
 # does the compiler support pdbtype and is it the newer compiler
 
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 63cbdb8..ef2f77d 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -31,6 +31,16 @@ void cmGlobalVisualStudio7Generator
   mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");
   mf->AddDefinition("CMAKE_GENERATOR_FC", "ifort");
   this->AddPlatformDefinitions(mf);
+  if(!mf->GetDefinition("CMAKE_CONFIGURATION_TYPES"))
+    {
+    mf->AddCacheDefinition(
+      "CMAKE_CONFIGURATION_TYPES",
+      "Debug;Release;MinSizeRel;RelWithDebInfo",
+      "Semicolon separated list of supported configuration types, "
+      "only supports Debug, Release, MinSizeRel, and RelWithDebInfo, "
+      "anything else will be ignored.",
+      cmCacheManager::STRING);
+    }
 
   // Create list of configurations requested by user's cache, if any.
   this->cmGlobalGenerator::EnableLanguage(lang, mf, optional);

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

Summary of changes:
 Modules/Platform/Windows-MSVC.cmake       |    3 ---
 Modules/Platform/Windows-df.cmake         |    2 --
 Source/cmGlobalVisualStudio7Generator.cxx |   10 ++++++++++
 3 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake