[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2196-g475dba7

[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  475dba7c77036c7424c1353dfb721fef4b4b701d (commit)
       via  bed6c388960749b9d93cbb3590896c6a663f83df (commit)
      from  74b4690a288f807e063e39a71e2404248503aef8 (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=475dba7c77036c7424c1353dfb721fef4b4b701d
commit 475dba7c77036c7424c1353dfb721fef4b4b701d
Merge: 74b4690 bed6c38
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 19 13:30:01 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 19 13:30:01 2013 -0500

    Merge topic 'ide-compiler-vars-cleanup' into next
    
    bed6c38 VS,Xcode: Remove unused CMAKE_GENERATOR_* variables


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bed6c388960749b9d93cbb3590896c6a663f83df
commit bed6c388960749b9d93cbb3590896c6a663f83df
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 19 09:28:13 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 19 09:29:11 2013 -0500

    VS,Xcode: Remove unused CMAKE_GENERATOR_* variables
    
    Since the topic merged to master by commit 34a02846 (Merge topic
    'ide-compiler-id', 2012-08-24), these variables are not used by
    CMakeDetermine*Compiler.cmake for VS and Xcode generators.  Drop the
    code that sets them.

diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx
index cb15c30..9f3af71 100644
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@@ -41,11 +41,8 @@ void cmGlobalVisualStudio6Generator
                  bool optional)
 {
   cmGlobalVisualStudioGenerator::AddPlatformDefinitions(mf);
-  mf->AddDefinition("CMAKE_GENERATOR_CC", "cl");
-  mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
   mf->AddDefinition("CMAKE_GENERATOR_RC", "rc");
   mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");
-  mf->AddDefinition("CMAKE_GENERATOR_Fortran", "ifort");
   this->GenerateConfigurations(mf);
   this->cmGlobalGenerator::EnableLanguage(lang, mf, optional);
 }
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 71d79a1..154aa32 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -27,11 +27,8 @@ void cmGlobalVisualStudio7Generator
 ::EnableLanguage(std::vector<std::string>const &  lang,
                  cmMakefile *mf, bool optional)
 {
-  mf->AddDefinition("CMAKE_GENERATOR_CC", "cl");
-  mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
   mf->AddDefinition("CMAKE_GENERATOR_RC", "rc");
   mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");
-  mf->AddDefinition("CMAKE_GENERATOR_FC", "ifort");
   this->AddPlatformDefinitions(mf);
 
   // Create list of configurations requested by user's cache, if any.
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 9600771..99a2640 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -237,8 +237,6 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const&
         cmCacheManager::STRING);
       }
     }
-  mf->AddDefinition("CMAKE_GENERATOR_CC", "gcc");
-  mf->AddDefinition("CMAKE_GENERATOR_CXX", "g++");
   mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");
   if(!this->PlatformToolset.empty())
     {

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

Summary of changes:
 Source/cmGlobalVisualStudio6Generator.cxx |    3 ---
 Source/cmGlobalVisualStudio7Generator.cxx |    3 ---
 Source/cmGlobalXCodeGenerator.cxx         |    2 --
 3 files changed, 0 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake