[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4285-gc63c08b

[Patrick Gansterer]

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  c63c08bede9efbd08efa8a26dc55caf40a825e8c (commit)
       via  016cd6dd7224c48aec5121f6ca7fd0f958f7e0ab (commit)
      from  8ba55f66ad4c31747d8ca9f084699a74fb43828f (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=c63c08bede9efbd08efa8a26dc55caf40a825e8c
commit c63c08bede9efbd08efa8a26dc55caf40a825e8c
Merge: 8ba55f6 016cd6d
Author:     Patrick Gansterer <paroga at paroga.com>
AuthorDate: Mon Sep 23 16:43:09 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 23 16:43:09 2013 -0400

    Merge topic 'corelibc' into next
    
    016cd6d Use corelibc.lib only for VS2005 and VS2008 when building for Windows CE


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=016cd6dd7224c48aec5121f6ca7fd0f958f7e0ab
commit 016cd6dd7224c48aec5121f6ca7fd0f958f7e0ab
Author:     Patrick Gansterer <paroga at paroga.com>
AuthorDate: Mon Sep 23 22:42:45 2013 +0200
Commit:     Patrick Gansterer <paroga at paroga.com>
CommitDate: Mon Sep 23 22:42:45 2013 +0200

    Use corelibc.lib only for VS2005 and VS2008 when building for Windows CE
    
    Fix the previous commit by checking for the correct version number of
    MSVC instead of adding the library unconditionally.

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index ab11b1f..d9881f2 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -141,10 +141,10 @@ if(WINCE)
 
   set(_RTC1 "")
   set(_FLAGS_CXX " /GR /EHsc")
-  set(CMAKE_C_STANDARD_LIBRARIES_INIT "coredll.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib")
+  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:
 Modules/Platform/Windows-MSVC.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake