[Cmake-commits] CMake branch, master, updated. v2.8.12-341-gf6cc3b0

[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, master has been updated
       via  f6cc3b074485f8ccf4b6566ac5f117feb40ce998 (commit)
       via  d14898b6dc4f5f20c96b02fccb313ba0c119033f (commit)
       via  a85e17e660c47820ccccd8378349497804d94483 (commit)
       via  af40e8c31256095eb8436b798fa1fbc0c71b0319 (commit)
       via  b8522a8c8a64d6f86dc3618f658b07f7ba1d8fcd (commit)
       via  2d36c9ab60f9d1fa5304ebf23b09fa79ff8b667e (commit)
       via  a6fd17ce50b18dd9d06cdd7fdb34bf68e987f7fc (commit)
      from  eff13ebf336a87e1e572ab89dea7a669674c20bc (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=f6cc3b074485f8ccf4b6566ac5f117feb40ce998
commit f6cc3b074485f8ccf4b6566ac5f117feb40ce998
Merge: eff13eb d14898b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 18 10:01:58 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 18 10:01:58 2013 -0400

    Merge topic 'vs-intel-compiler'
    
    d14898b Intel: Fix detection of MSVC version simulated by pre-11.0 Fortran
    a85e17e Intel: When simulating MSVC, re-use Windows-MSVC (#14476)
    af40e8c VS: Detect Intel Fortran compiler id and version
    b8522a8 VS: Expose Intel Fortran .vfproj format version to CMake language
    2d36c9a CMakeDetermineCompilerId: Fix Intel Fortran compiler id detection
    a6fd17c VS: Fix CMAKE_<LANG>_COMPILER detection with Intel toolset (#14471)


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

Summary of changes:
 Help/manual/cmake-variables.7.rst                  |    1 +
 .../CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.rst     |    7 ++
 Modules/CMakeCCompilerId.c.in                      |    6 ++
 Modules/CMakeCXXCompilerId.cpp.in                  |    6 ++
 Modules/CMakeDetermineCompilerId.cmake             |   14 +++-
 Modules/CMakeDetermineFortranCompiler.cmake        |    4 -
 Modules/CMakeFindBinUtils.cmake                    |    1 +
 Modules/CMakeFortranCompiler.cmake.in              |    2 +
 Modules/CMakeFortranCompilerId.F.in                |   18 ++++
 Modules/CompilerId/VS-Intel.vfproj.in              |   42 +++++++++
 Modules/Platform/Windows-Intel-CXX.cmake           |    1 -
 Modules/Platform/Windows-Intel.cmake               |   93 ++------------------
 Modules/Platform/Windows-MSVC.cmake                |   15 ++-
 Source/cmGlobalVisualStudio7Generator.cxx          |   43 +++++++++-
 Source/cmGlobalVisualStudio7Generator.h            |    7 ++
 Source/cmLocalVisualStudio7Generator.cxx           |   30 +------
 16 files changed, 161 insertions(+), 129 deletions(-)
 create mode 100644 Help/variable/CMAKE_VS_INTEL_Fortran_PROJECT_VERSION.rst
 create mode 100644 Modules/CompilerId/VS-Intel.vfproj.in


hooks/post-receive
-- 
CMake