[Cmake-commits] CMake branch, next, updated. v3.0.2-5415-g2b3ce83

[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  2b3ce8341c1d4862f20a798746c128ddac1ad540 (commit)
       via  e7aeb79f08dd031f5fe3fd16d6d4b644b5b97000 (commit)
      from  c58a90cde0fb09899c7999cc89ea6145edc2ff15 (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=2b3ce8341c1d4862f20a798746c128ddac1ad540
commit 2b3ce8341c1d4862f20a798746c128ddac1ad540
Merge: c58a90c e7aeb79
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 22 10:24:07 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 22 10:24:07 2014 -0400

    Merge topic 'vs-wince-exe-entry-point' into next
    
    e7aeb79f VS, WINCE: Only set EntryPointSymbol for executables


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7aeb79f08dd031f5fe3fd16d6d4b644b5b97000
commit e7aeb79f08dd031f5fe3fd16d6d4b644b5b97000
Author:     Pascal Bach <pascal.bach at siemens.com>
AuthorDate: Mon Sep 22 16:19:36 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 22 10:23:16 2014 -0400

    VS, WINCE: Only set EntryPointSymbol for executables

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index fc8fccd..8e73169 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2122,7 +2122,10 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        linkOptions.AddFlag("EntryPointSymbol", "WinMainCRTStartup");
+        if (this->Target->GetType() == cmTarget::EXECUTABLE)
+          {
+          linkOptions.AddFlag("EntryPointSymbol", "WinMainCRTStartup");
+          }
         }
       else
         {
@@ -2134,7 +2137,10 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
       if (this->GlobalGenerator->TargetsWindowsCE())
         {
         linkOptions.AddFlag("SubSystem", "WindowsCE");
-        linkOptions.AddFlag("EntryPointSymbol", "mainACRTStartup");
+        if (this->Target->GetType() == cmTarget::EXECUTABLE)
+          {
+          linkOptions.AddFlag("EntryPointSymbol", "mainACRTStartup");
+          }
         }
       else
         {

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

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


hooks/post-receive
-- 
CMake