[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4316-gbf73025

Brad King brad.king at kitware.com
Wed Sep 25 08:32:42 EDT 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  bf7302535f6518908bb377d2694af5b4b64327b7 (commit)
       via  8bb3b3d344b6bf49bf5ba05fa90faedce72378a5 (commit)
      from  bfab533e6a68350f65bd0ff3f516fd0935ea242c (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=bf7302535f6518908bb377d2694af5b4b64327b7
commit bf7302535f6518908bb377d2694af5b4b64327b7
Merge: bfab533 8bb3b3d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 25 08:32:41 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 25 08:32:41 2013 -0400

    Merge topic 'wince-subsystem' into next
    
    8bb3b3d VS: Use version-specific subsystem for WinCE compiler id (#14440)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bb3b3d344b6bf49bf5ba05fa90faedce72378a5
commit 8bb3b3d344b6bf49bf5ba05fa90faedce72378a5
Author:     Patrick Gansterer <paroga at paroga.com>
AuthorDate: Wed Sep 25 05:25:07 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 25 08:29:03 2013 -0400

    VS: Use version-specific subsystem for WinCE compiler id (#14440)
    
    The subsystem must be set to WINDWOSCE for some SDKs to link an
    executable. Set it to 9 for VS2005 and to 8 for VS2008, since the
    value differs between the different Visual Studio versions.

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index ebd9ce0..8ca5334 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -133,7 +133,11 @@ Id flags: ${testflags}
     endif()
     if(CMAKE_VS_WINCE_VERSION)
       set(id_entrypoint "mainACRTStartup")
-      set(id_subsystem 9)
+      if("${vs_version}" VERSION_LESS 9)
+        set(id_subsystem 9)
+      else()
+        set(id_subsystem 8)
+      endif()
     else()
       set(id_subsystem 1)
     endif()

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

Summary of changes:


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list