[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-986-gd39df85

[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  d39df852faa5424913e350b13a53232aafbce1fb (commit)
       via  a4962595835d0496d7a8fe5ba5f4290a41e07099 (commit)
      from  46b503d3f72e3ea69609f79f84a94b5dfc868b07 (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=d39df852faa5424913e350b13a53232aafbce1fb
commit d39df852faa5424913e350b13a53232aafbce1fb
Merge: 46b503d a496259
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 2 09:33:53 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 2 09:33:53 2014 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4962595835d0496d7a8fe5ba5f4290a41e07099
commit a4962595835d0496d7a8fe5ba5f4290a41e07099
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: Tue Dec 2 09:32:16 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 mainWCRTStartup 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:
 Source/cmVisualStudio10TargetGenerator.cxx |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake