[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1145-g5cd0db5
Brad King
brad.king at kitware.com
Fri Nov 30 09:51:07 EST 2012
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 5cd0db5e541e7887c76b3c4957249ff8a7e3c22c (commit)
via 6b40e1ba3e1367c5da79ac1b2206b9a87c90aaaf (commit)
via 8e85822e2bd00db737b585393a1ad3c77895e071 (commit)
via 5bf9fd8253ec804498c0f3339c4d706cab3673ea (commit)
from bc201e3dcc00121c5854ba619a7d6a23e2bf4360 (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=5cd0db5e541e7887c76b3c4957249ff8a7e3c22c
commit 5cd0db5e541e7887c76b3c4957249ff8a7e3c22c
Merge: bc201e3 6b40e1b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 30 09:51:06 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 30 09:51:06 2012 -0500
Merge topic 'windows-ce' into next
6b40e1b VS: Ignore LIBC.lib when linking the CompilerId executables
8e85822 VS: Add the entry point when compiling for WindowsCE
5bf9fd8 VS: Set the correct SubSystem when determinating the CompilerId
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b40e1ba3e1367c5da79ac1b2206b9a87c90aaaf
commit 6b40e1ba3e1367c5da79ac1b2206b9a87c90aaaf
Author: Patrick Gansterer <paroga at paroga.com>
AuthorDate: Fri Nov 30 15:17:50 2012 +0100
Commit: Patrick Gansterer <paroga at paroga.com>
CommitDate: Fri Nov 30 15:17:50 2012 +0100
VS: Ignore LIBC.lib when linking the CompilerId executables
Some Windows CE linkers want to link against LIBC.lib, but can not
find them. Since they are not required we can simply ignore it.
diff --git a/Modules/CompilerId/VS-7.vcproj.in b/Modules/CompilerId/VS-7.vcproj.in
index 3e2b34a..fa48cad 100644
--- a/Modules/CompilerId/VS-7.vcproj.in
+++ b/Modules/CompilerId/VS-7.vcproj.in
@@ -34,6 +34,7 @@
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
+ IgnoreDefaultLibraryNames="libc"
GenerateDebugInformation="false"
SubSystem="@id_subsystem@"
EntryPointSymbol="@id_entrypoint@"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e85822e2bd00db737b585393a1ad3c77895e071
commit 8e85822e2bd00db737b585393a1ad3c77895e071
Author: Patrick Gansterer <paroga at paroga.com>
AuthorDate: Fri Nov 30 15:15:06 2012 +0100
Commit: Patrick Gansterer <paroga at paroga.com>
CommitDate: Fri Nov 30 15:15:06 2012 +0100
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.
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"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5bf9fd8253ec804498c0f3339c4d706cab3673ea
commit 5bf9fd8253ec804498c0f3339c4d706cab3673ea
Author: Patrick Gansterer <paroga at paroga.com>
AuthorDate: Fri Nov 30 14:14:27 2012 +0100
Commit: Patrick Gansterer <paroga at paroga.com>
CommitDate: Fri Nov 30 14:14:27 2012 +0100
VS: Set the correct SubSystem when determinating the CompilerId
Some WinCE linker only work when the subsystem is set to WINDOWSCE.
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 43469ea..40e4f5a 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -142,6 +142,9 @@ Id flags: ${testflags}
endif()
if(CMAKE_VS_WINCE_VERSION)
set(id_definitions "ADD_MAINCRTSTARTUP")
+ set(id_subsystem 9)
+ else()
+ set(id_subsystem 1)
endif()
if("${CMAKE_MAKE_PROGRAM}" MATCHES "[Mm][Ss][Bb][Uu][Ii][Ll][Dd]")
set(build /p:Configuration=Debug /p:Platform=@id_arch@ /p:VisualStudioVersion=${vs_version}.0)
diff --git a/Modules/CompilerId/VS-7.vcproj.in b/Modules/CompilerId/VS-7.vcproj.in
index b1449e4..5b68e86 100644
--- a/Modules/CompilerId/VS-7.vcproj.in
+++ b/Modules/CompilerId/VS-7.vcproj.in
@@ -36,7 +36,7 @@
Name="VCLinkerTool"
LinkIncremental="1"
GenerateDebugInformation="false"
- SubSystem="1"
+ SubSystem="@id_subsystem@"
/>
<Tool
Name="VCPostBuildEventTool"
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeCCompilerId.c.in | 4 ----
Modules/CMakeCXXCompilerId.cpp.in | 4 ----
Modules/CMakeDetermineCompilerId.cmake | 5 ++++-
Modules/CompilerId/VS-7.vcproj.in | 5 +++--
4 files changed, 7 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list