[Cmake-commits] CMake branch, next, updated. v2.8.9-298-g593ef91

[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  593ef91a51c2ccb6e3c38f7bd1d2cba11ba963d5 (commit)
       via  a0791935aa200482a10d5cd50696645b2ce2ae15 (commit)
      from  c6350999d216af4a3320671b00105f3e4925568a (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=593ef91a51c2ccb6e3c38f7bd1d2cba11ba963d5
commit 593ef91a51c2ccb6e3c38f7bd1d2cba11ba963d5
Merge: c635099 a079193
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 29 09:37:02 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 29 09:37:02 2012 -0400

    Merge topic 'msvc-compiler-info' into next
    
    a079193 VS: Fix MSVC_VERSION computation broken by refactoring


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0791935aa200482a10d5cd50696645b2ce2ae15
commit a0791935aa200482a10d5cd50696645b2ce2ae15
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 29 09:33:27 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 29 09:36:42 2012 -0400

    VS: Fix MSVC_VERSION computation broken by refactoring
    
    Refactoring in commit 2eef0980 (Modernize MSVC compiler information files,
    2012-08-23) introduced incorrect logic to transform version components
    from CMAKE_(C|CXX)_COMPILER_VERSION into MSVC_VERSION.  While it converted
    "13.10" to "1300" it also converted "15.0" into "150" instead of "1500".
    Use math(EXPR) to encode the version components in a single integer.

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index ac31dd6..b3cb19b 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -68,7 +68,7 @@ if(NOT MSVC_VERSION)
     set(_compiler_version ${CMAKE_CXX_COMPILER_VERSION})
   endif()
   if("${_compiler_version}" MATCHES "^([0-9]+)\\.([0-9]+)")
-    set(MSVC_VERSION "${CMAKE_MATCH_1}${CMAKE_MATCH_2}")
+    math(EXPR MSVC_VERSION "${CMAKE_MATCH_1}*100 + ${CMAKE_MATCH_2}")
   else()
     message(FATAL_ERROR "MSVC compiler version not detected properly: ${_compiler_version}")
   endif()

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

Summary of changes:
 Modules/Platform/Windows-MSVC.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake