diff options
| author | Patrick Gansterer <paroga@paroga.com> | 2013-08-04 18:11:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-08-07 12:26:26 (GMT) |
| commit | 8fcf0ab020a9496e53051bb9effdc68e44be3af6 (patch) | |
| tree | 2aa03620229c806ac0fd8f68e9f4ce4c0bb91daf | |
| parent | 09b147b3a7c864c3d9c044d970235a49f3d69b7a (diff) | |
| download | CMake-8fcf0ab020a9496e53051bb9effdc68e44be3af6.zip CMake-8fcf0ab020a9496e53051bb9effdc68e44be3af6.tar.gz CMake-8fcf0ab020a9496e53051bb9effdc68e44be3af6.tar.bz2 | |
Add support for new Windows CE compiler
The new compiler versions do not need corelibc.lib as a default
link library and a architecture detection workaround.
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 1a2d3e9..685638a 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -141,8 +141,12 @@ if(WINCE) set(_RTC1 "") set(_FLAGS_CXX " /GR /EHsc") - set(CMAKE_C_STANDARD_LIBRARIES_INIT "coredll.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib") + set(CMAKE_C_STANDARD_LIBRARIES_INIT "coredll.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib") set(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT} /NODEFAULTLIB:libc.lib /NODEFAULTLIB:oldnames.lib") + + if (MSVC_VERSION LESS 1500) + set(CMAKE_C_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT} corelibc.lib") + endif () else() set(_PLATFORM_DEFINES "/DWIN32") |