[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4287-g4030ef5

[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  4030ef52205582fe55509bd02f818f32ee2044d7 (commit)
       via  e63cf5f0999da8242c6e32698521d7e2eb12497b (commit)
      from  c63c08bede9efbd08efa8a26dc55caf40a825e8c (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=4030ef52205582fe55509bd02f818f32ee2044d7
commit 4030ef52205582fe55509bd02f818f32ee2044d7
Merge: c63c08b e63cf5f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 23 17:17:17 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 23 17:17:17 2013 -0400

    Merge topic 'wince-corelibc' into next
    
    e63cf5f MSVC: Fix version test for linking corelibc on Windows CE (#14420)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e63cf5f0999da8242c6e32698521d7e2eb12497b
commit e63cf5f0999da8242c6e32698521d7e2eb12497b
Author:     Patrick Gansterer <paroga at paroga.com>
AuthorDate: Mon Sep 23 19:38:13 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 23 17:11:47 2013 -0400

    MSVC: Fix version test for linking corelibc on Windows CE (#14420)
    
    In commit 8fcf0ab0 (Add support for new Windows CE compiler, 2013-08-04)
    we made corelibc conditional on the MSVC version, but the version value
    was incorrect.  Update it to use corelibc for VS 2008 and below.

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 8cb7fd5..d9881f2 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -144,7 +144,7 @@ if(WINCE)
   set(CMAKE_C_STANDARD_LIBRARIES_INIT "coredll.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib")
   set(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT} /NODEFAULTLIB:libc.lib /NODEFAULTLIB:oldnames.lib")
 
-  if (MSVC_VERSION LESS 1500)
+  if (MSVC_VERSION LESS 1600)
     set(CMAKE_C_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT} corelibc.lib")
   endif ()
 else()

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

Summary of changes:


hooks/post-receive
-- 
CMake