summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorPatrick Gansterer <paroga@paroga.com>2012-11-30 14:15:06 (GMT)
committerPatrick Gansterer <paroga@paroga.com>2012-11-30 14:15:06 (GMT)
commit8e85822e2bd00db737b585393a1ad3c77895e071 (patch)
tree6fbf36e98bb35f0d44f73855d9f1a2333ba56ca1 /Modules
parent5bf9fd8253ec804498c0f3339c4d706cab3673ea (diff)
downloadCMake-8e85822e2bd00db737b585393a1ad3c77895e071.zip
CMake-8e85822e2bd00db737b585393a1ad3c77895e071.tar.gz
CMake-8e85822e2bd00db737b585393a1ad3c77895e071.tar.bz2
VS: Add the entry point when compiling for WindowsCE
Set the entry point to mainACRTStartup to make sure that main() can be found when linking the application to check the compiler.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CMakeCCompilerId.c.in4
-rw-r--r--Modules/CMakeCXXCompilerId.cpp.in4
-rw-r--r--Modules/CMakeDetermineCompilerId.cmake2
-rw-r--r--Modules/CompilerId/VS-7.vcproj.in2
4 files changed, 2 insertions, 10 deletions
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in
index 3d1380c..2d76c7a 100644
--- a/Modules/CMakeCCompilerId.c.in
+++ b/Modules/CMakeCCompilerId.c.in
@@ -228,7 +228,3 @@ int main(int argc, char* argv[])
return require;
}
#endif
-
-#ifdef ADD_MAINCRTSTARTUP
-void mainCRTStartup() {}
-#endif
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in
index 142a5c5..5e70a41 100644
--- a/Modules/CMakeCXXCompilerId.cpp.in
+++ b/Modules/CMakeCXXCompilerId.cpp.in
@@ -210,7 +210,3 @@ int main(int argc, char* argv[])
(void)argv;
return require;
}
-
-#ifdef ADD_MAINCRTSTARTUP
-extern "C" void mainCRTStartup() {}
-#endif
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 40e4f5a..609f35b 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -141,7 +141,7 @@ Id flags: ${testflags}
set(id_toolset "")
endif()
if(CMAKE_VS_WINCE_VERSION)
- set(id_definitions "ADD_MAINCRTSTARTUP")
+ set(id_entrypoint "mainACRTStartup")
set(id_subsystem 9)
else()
set(id_subsystem 1)
diff --git a/Modules/CompilerId/VS-7.vcproj.in b/Modules/CompilerId/VS-7.vcproj.in
index 5b68e86..3e2b34a 100644
--- a/Modules/CompilerId/VS-7.vcproj.in
+++ b/Modules/CompilerId/VS-7.vcproj.in
@@ -24,7 +24,6 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="@id_definitions@"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -37,6 +36,7 @@
LinkIncremental="1"
GenerateDebugInformation="false"
SubSystem="@id_subsystem@"
+ EntryPointSymbol="@id_entrypoint@"
/>
<Tool
Name="VCPostBuildEventTool"