[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2136-g4c0b1c0

[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  4c0b1c0120ca786b2ddb2d1121178183ec8f5b1c (commit)
       via  cf82d1e1669a00dee19c241da2207e0b8e65cfbf (commit)
       via  8f4cae7aa6e00fb969828ba46326887d0dbcd72c (commit)
      from  0eab4482a96ea50f597734b04adc8fb032d02bff (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=4c0b1c0120ca786b2ddb2d1121178183ec8f5b1c
commit 4c0b1c0120ca786b2ddb2d1121178183ec8f5b1c
Merge: 0eab448 cf82d1e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 13 14:00:09 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 13 14:00:09 2013 -0500

    Merge topic 'windows-ce-vs-subsystem' into next
    
    cf82d1e VS: Specify WinCE subsystems correctly in VS 9 2008
    8f4cae7 VS: Specify WinCE subsystem also for DLLs


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf82d1e1669a00dee19c241da2207e0b8e65cfbf
commit cf82d1e1669a00dee19c241da2207e0b8e65cfbf
Author:     Mark Salisbury <mark.salisbury at hp.com>
AuthorDate: Wed Feb 13 09:48:32 2013 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 13 13:37:49 2013 -0500

    VS: Specify WinCE subsystems correctly in VS 9 2008

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 620e9b3..f07ebef 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1136,7 +1136,14 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     if(this->WindowsCEProject)
       {
-      fout << "\t\t\t\tSubSystem=\"9\"\n";
+      if(this->GetVersion() < VS9)
+        {
+        fout << "\t\t\t\tSubSystem=\"9\"\n";
+        }
+      else
+        {
+        fout << "\t\t\t\tSubSystem=\"8\"\n";
+        }
       }
     std::string stackVar = "CMAKE_";
     stackVar += linkLanguage;
@@ -1227,8 +1234,15 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       }
     if ( this->WindowsCEProject )
       {
-      fout << "\t\t\t\tSubSystem=\"9\"\n"
-           << "\t\t\t\tEntryPointSymbol=\""
+      if(this->GetVersion() < VS9)
+        {
+        fout << "\t\t\t\tSubSystem=\"9\"\n";
+        }
+      else
+        {
+        fout << "\t\t\t\tSubSystem=\"8\"\n";
+        }
+      fout << "\t\t\t\tEntryPointSymbol=\""
            << (isWin32Executable ? "WinMainCRTStartup" : "mainACRTStartup")
            << "\"\n";
       }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f4cae7aa6e00fb969828ba46326887d0dbcd72c
commit 8f4cae7aa6e00fb969828ba46326887d0dbcd72c
Author:     Mark Salisbury <mark.salisbury at hp.com>
AuthorDate: Wed Feb 13 09:30:14 2013 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 13 13:37:18 2013 -0500

    VS: Specify WinCE subsystem also for DLLs
    
    This fixes a link error in VS 2005: unresolved external symbol
    __DllMainCRTStartup at 12.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index f9df861..620e9b3 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1134,6 +1134,10 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
       {
       fout << "\t\t\t\tGenerateDebugInformation=\"TRUE\"\n";
       }
+    if(this->WindowsCEProject)
+      {
+      fout << "\t\t\t\tSubSystem=\"9\"\n";
+      }
     std::string stackVar = "CMAKE_";
     stackVar += linkLanguage;
     stackVar += "_STACK_SIZE";

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

Summary of changes:
 Source/cmLocalVisualStudio7Generator.cxx |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake