[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1109-g5e666d8

[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  5e666d80cabcae57555df81df15cd2e70177b865 (commit)
       via  df01a380f0a1586629db9445173650fbac6de31b (commit)
      from  391654193b2be0815c0a546ca0a9a3d6a092af8e (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=5e666d80cabcae57555df81df15cd2e70177b865
commit 5e666d80cabcae57555df81df15cd2e70177b865
Merge: 3916541 df01a38
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 9 10:33:52 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 9 10:33:52 2014 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df01a380f0a1586629db9445173650fbac6de31b
commit df01a380f0a1586629db9445173650fbac6de31b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 9 10:31:05 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 9 10:31:05 2014 -0500

    Revert "VS, WINCE: Fix entry point for Unicode builds"
    
    This reverts commit 681cda02bf656c1cc114632d60afc8bd0cac4b09.
    The selection of entry point depends on the source code content
    and is independent of whether _UNICODE is defined.

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

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |   18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
CMake