[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1122-ga660cdb

[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  a660cdb10ece78f5d19456c07cce628ee47bdf0e (commit)
       via  0e75a3371daf0bad47d467fd8168c445373c51b5 (commit)
      from  9a91d8a80855a5db8446f73c527c28aecdf17ee3 (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=a660cdb10ece78f5d19456c07cce628ee47bdf0e
commit a660cdb10ece78f5d19456c07cce628ee47bdf0e
Merge: 9a91d8a 0e75a33
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 11 11:42:58 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 11 11:42:58 2014 -0500

    Merge topic 'fix-wince-unicode-entry-point' into next
    
    0e75a337 Revert "Revert "VS, WINCE: Fix entry point for Unicode builds""


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e75a3371daf0bad47d467fd8168c445373c51b5
commit 0e75a3371daf0bad47d467fd8168c445373c51b5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 11 11:38:55 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 11 11:38:55 2014 -0500

    Revert "Revert "VS, WINCE: Fix entry point for Unicode builds""
    
    This reverts commit df01a380f0a1586629db9445173650fbac6de31b.
    The VS <= 9 generators have logic that Unicode implies wmain.
    Use that in VS >= 10 for consistency across VS versions.

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