[Cmake-commits] CMake branch, next, updated. v2.8.3-1513-gfa9d519

[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  fa9d51912fb1184041c5dc2e90d46b04ce1ed4bb (commit)
       via  e6221ed2c41de86020083c4d2af58c7b28d36bb0 (commit)
      from  be2fd29aa802e2b2b4a8e3fd869ada92673391ab (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=fa9d51912fb1184041c5dc2e90d46b04ce1ed4bb
commit fa9d51912fb1184041c5dc2e90d46b04ce1ed4bb
Merge: be2fd29 e6221ed
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Jan 28 10:19:43 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 28 10:19:43 2011 -0500

    Merge topic 'fix-8914-allow-config-types-override' into next
    
    e6221ed Xcode: Allow override of CMAKE_CONFIGURATION_TYPES (#8914)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6221ed2c41de86020083c4d2af58c7b28d36bb0
commit e6221ed2c41de86020083c4d2af58c7b28d36bb0
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Jan 28 09:52:47 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Jan 28 09:52:47 2011 -0500

    Xcode: Allow override of CMAKE_CONFIGURATION_TYPES (#8914)

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 1395865..d73c833 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -165,13 +165,16 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const&
     }
   else
     {
-    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);
+    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);
+      }
     }
   mf->AddDefinition("CMAKE_GENERATOR_CC", "gcc");
   mf->AddDefinition("CMAKE_GENERATOR_CXX", "g++");

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake