[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4314-gbfab533

Patrick Gansterer paroga at paroga.com
Tue Sep 24 23:26:19 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  bfab533e6a68350f65bd0ff3f516fd0935ea242c (commit)
       via  bcb758526a107402448f8cc9bb54b6a833382b2f (commit)
      from  b046d3cd1c5463996548aaaefd94fb46dd6ce727 (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=bfab533e6a68350f65bd0ff3f516fd0935ea242c
commit bfab533e6a68350f65bd0ff3f516fd0935ea242c
Merge: b046d3c bcb7585
Author:     Patrick Gansterer <paroga at paroga.com>
AuthorDate: Tue Sep 24 23:26:18 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 24 23:26:18 2013 -0400

    Merge topic 'wince-subsystem' into next
    
    bcb7585 VS: Use correct subsystem for VS2008 when checking WinCE compiler id


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bcb758526a107402448f8cc9bb54b6a833382b2f
commit bcb758526a107402448f8cc9bb54b6a833382b2f
Author:     Patrick Gansterer <paroga at paroga.com>
AuthorDate: Wed Sep 25 05:25:07 2013 +0200
Commit:     Patrick Gansterer <paroga at paroga.com>
CommitDate: Wed Sep 25 05:25:07 2013 +0200

    VS: Use correct subsystem for VS2008 when checking WinCE compiler id
    
    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:
 Modules/CMakeDetermineCompilerId.cmake |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list