[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1032-g8902885

[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  890288592800ea037c0e176329a02492db4df226 (commit)
       via  681cda02bf656c1cc114632d60afc8bd0cac4b09 (commit)
      from  90db0ab1f178901caab463d797b262f015407cca (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=890288592800ea037c0e176329a02492db4df226
commit 890288592800ea037c0e176329a02492db4df226
Merge: 90db0ab 681cda0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 3 09:08:10 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 3 09:08:10 2014 -0500

    Merge topic 'fix-wince-unicode-entry-point' into next
    
    681cda02 VS, WINCE: Fix entry point for Unicode builds


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=681cda02bf656c1cc114632d60afc8bd0cac4b09
commit 681cda02bf656c1cc114632d60afc8bd0cac4b09
Author:     Pascal Bach <pascal.bach at siemens.com>
AuthorDate: Tue Dec 2 13:33:42 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 3 09:07:11 2014 -0500

    VS, WINCE: Fix entry point for Unicode builds
    
    When _UNICODE is defined VS uses wmain instead of main as the entry function.
    To make this correctly work on WindowsCE EntryPointSymbol needs to be set to
    mainWCRTStartup instead of mainACRTStartup for console applications and to
    wWinMainCRTStartup instead of WinMainCRTStartup for GUI applications.
    
    Signed-off-by: Pascal Bach <pascal.bach at siemens.com>

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 26fc317..2ef27e2 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2267,7 +2267,14 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
         linkOptions.AddFlag("SubSystem", "WindowsCE");
         if (this->Target->GetType() == cmTarget::EXECUTABLE)
           {
-          linkOptions.AddFlag("EntryPointSymbol", "WinMainCRTStartup");
+          if (this->ClOptions[config]->UsingUnicode())
+            {
+            linkOptions.AddFlag("EntryPointSymbol", "wWinMainCRTStartup");
+            }
+          else
+            {
+            linkOptions.AddFlag("EntryPointSymbol", "WinMainCRTStartup");
+            }
           }
         }
       else
@@ -2282,7 +2289,14 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
         linkOptions.AddFlag("SubSystem", "WindowsCE");
         if (this->Target->GetType() == cmTarget::EXECUTABLE)
           {
-          linkOptions.AddFlag("EntryPointSymbol", "mainACRTStartup");
+          if (this->ClOptions[config]->UsingUnicode())
+            {
+            linkOptions.AddFlag("EntryPointSymbol", "mainWCRTStartup");
+            }
+          else
+            {
+            linkOptions.AddFlag("EntryPointSymbol", "mainACRTStartup");
+            }
           }
         }
       else

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

Summary of changes:


hooks/post-receive
-- 
CMake