[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2305-g76669b0

Brad King brad.king at kitware.com
Fri Feb 22 16:13:59 EST 2013


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  76669b0cc1b136abea07751203b0b5573ae45165 (commit)
       via  9f941816348493522f8ddf60e633c1e82d9002cb (commit)
      from  634feee1453189f58ffeb26352ae2fb75b4101df (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=76669b0cc1b136abea07751203b0b5573ae45165
commit 76669b0cc1b136abea07751203b0b5573ae45165
Merge: 634feee 9f94181
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 22 16:13:57 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 22 16:13:57 2013 -0500

    Merge topic 'ide-compiler-vars-Fortran' into next
    
    9f94181 VS: Restore CMAKE_GENERATOR_FC variable


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f941816348493522f8ddf60e633c1e82d9002cb
commit 9f941816348493522f8ddf60e633c1e82d9002cb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 22 16:07:09 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 22 16:12:48 2013 -0500

    VS: Restore CMAKE_GENERATOR_FC variable
    
    In commit bed6c388 (VS,Xcode: Remove unused CMAKE_GENERATOR_* variables,
    2013-02-19) we removed this variable among others from the VS generator
    claiming they were all not used.  In fact the Fortran compiler detection
    module CMakeDetermineFortranCompiler.cmake uses CMAKE_GENERATOR_FC even
    for the Visual Studio IDE generators because it does not use the full
    IDE compiler id detection like the C and C++ language files do.

diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 154aa32..63cbdb8 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -29,6 +29,7 @@ void cmGlobalVisualStudio7Generator
 {
   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.

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

Summary of changes:
 Source/cmGlobalVisualStudio7Generator.cxx |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list