[Cmake-commits] CMake branch, next, updated. v3.0.1-4767-g65fd43e
Brad King
brad.king at kitware.com
Tue Aug 5 15:14:37 EDT 2014
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 65fd43e000b469d063f1fac64f3c25c8eaab1224 (commit)
via c9863435713048c86d5936cc9361aec0140f8b17 (commit)
via 60383cc9a0fbd6d31253baa3ae2326aef447dcdb (commit)
via 77cafaf0319acb9272c70b347e01efedf78c1e3f (commit)
from 0eef684a7f76e18adfc874641ebf50ae81024e6f (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=65fd43e000b469d063f1fac64f3c25c8eaab1224
commit 65fd43e000b469d063f1fac64f3c25c8eaab1224
Merge: 0eef684 c986343
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 5 15:14:36 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 5 15:14:36 2014 -0400
Merge topic 'vs-windows-sdk-desktop-arm' into next
c9863435 MSVC: Select default standard libraries for ARM platform
60383cc9 VS: Fix generation of desktop applications for ARM
77cafaf0 CMakeDetermineCompilerId: Fix detection for VS ARM platform
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9863435713048c86d5936cc9361aec0140f8b17
commit c9863435713048c86d5936cc9361aec0140f8b17
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 5 15:02:49 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 5 15:03:26 2014 -0400
MSVC: Select default standard libraries for ARM platform
For Windows ARM targets, only kernel32.lib and user32.lib are standard.
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 9d4aca2..0c2e21b 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -167,13 +167,17 @@ elseif(WINDOWS_PHONE OR WINDOWS_STORE)
set(_FLAGS_CXX " /DUNICODE /D_UNICODE /GR /EHsc")
if(WINDOWS_PHONE)
set(CMAKE_C_STANDARD_LIBRARIES_INIT "WindowsPhoneCore.lib RuntimeObject.lib PhoneAppModelHost.lib")
+ elseif(MSVC_C_ARCHITECTURE_ID STREQUAL ARM OR MSVC_CXX_ARCHITECTURE_ID STREQUAL ARM)
+ set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib")
else()
set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib")
endif()
else()
set(_PLATFORM_DEFINES "/DWIN32")
- if(MSVC_VERSION GREATER 1310)
+ if(MSVC_C_ARCHITECTURE_ID STREQUAL ARM OR MSVC_CXX_ARCHITECTURE_ID STREQUAL ARM)
+ set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib")
+ elseif(MSVC_VERSION GREATER 1310)
set(_RTC1 "/RTC1")
set(_FLAGS_CXX " /GR /EHsc")
set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60383cc9a0fbd6d31253baa3ae2326aef447dcdb
commit 60383cc9a0fbd6d31253baa3ae2326aef447dcdb
Author: Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Tue Aug 5 15:00:09 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 5 15:00:32 2014 -0400
VS: Fix generation of desktop applications for ARM
Add WindowsSDKDesktopARMSupport to the .vcxproj to avoid 'error MSB8022:
Compiling Desktop applications for the ARM platform is not supported.'
from VS.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 0062b4a..6989c51 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2202,4 +2202,9 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
"</MinimumVisualStudioVersion>\n", 2);
}
}
+ if (this->Platform == "ARM")
+ {
+ this->WriteString("<WindowsSDKDesktopARMSupport>true"
+ "</WindowsSDKDesktopARMSupport>", 2);
+ }
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77cafaf0319acb9272c70b347e01efedf78c1e3f
commit 77cafaf0319acb9272c70b347e01efedf78c1e3f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 5 14:44:12 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 5 14:45:07 2014 -0400
CMakeDetermineCompilerId: Fix detection for VS ARM platform
Add WindowsSDKDesktopARMSupport to the compiler id .vcxproj to
avoid 'error MSB8022: Compiling Desktop applications for the ARM
platform is not supported.' from VS.
Inspired-by: Minmin Gong <minmin.gong at gmail.com>
Inspired-by: Gilles Khouzam <gillesk at microsoft.com>
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index a780fa6..1fca55d 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -180,6 +180,11 @@ Id flags: ${testflags}
else()
set(id_system_version "")
endif()
+ if(id_platform STREQUAL ARM)
+ set(id_WindowsSDKDesktopARMSupport "<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>")
+ else()
+ set(id_WindowsSDKDesktopARMSupport "")
+ endif()
if(CMAKE_VS_WINCE_VERSION)
set(id_entrypoint "mainACRTStartup")
if("${vs_version}" VERSION_LESS 9)
diff --git a/Modules/CompilerId/VS-10.vcxproj.in b/Modules/CompilerId/VS-10.vcxproj.in
index bacbca4..a17d03d 100644
--- a/Modules/CompilerId/VS-10.vcxproj.in
+++ b/Modules/CompilerId/VS-10.vcxproj.in
@@ -12,6 +12,7 @@
<Keyword>Win32Proj</Keyword>
@id_system@
@id_system_version@
+ @id_WindowsSDKDesktopARMSupport@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@id_platform@'" Label="Configuration">
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeDetermineCompilerId.cmake | 5 +++++
Modules/CompilerId/VS-10.vcxproj.in | 1 +
Modules/Platform/Windows-MSVC.cmake | 6 +++++-
Source/cmVisualStudio10TargetGenerator.cxx | 5 +++++
4 files changed, 16 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list