summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-09-24 13:21:48 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-09-24 13:21:48 (GMT)
commitefd16ba928476bc1a576efc16d666661d31f0f49 (patch)
treed0a277edd6faa3884a9c576649359069022ba277
parente6a7abd2b69b45933abb5617a8bf5b800b2dde6f (diff)
parente7aeb79f08dd031f5fe3fd16d6d4b644b5b97000 (diff)
downloadCMake-efd16ba928476bc1a576efc16d666661d31f0f49.zip
CMake-efd16ba928476bc1a576efc16d666661d31f0f49.tar.gz
CMake-efd16ba928476bc1a576efc16d666661d31f0f49.tar.bz2
Merge topic 'vs-wince-exe-entry-point'
e7aeb79f VS, WINCE: Only set EntryPointSymbol for executables
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx10
1 files changed, 8 insertions, 2 deletions
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
{