diff options
| author | Brad King <brad.king@kitware.com> | 2013-02-05 19:46:20 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-02-05 19:46:20 (GMT) |
| commit | 08f69324bb440ea873d78e271a3f360b9c558af7 (patch) | |
| tree | 039e59bac2cf4d43a1cd0b672cbb1c6d659461d5 | |
| parent | 50de1247a0aed5eab03fbedd76a79cc9694794e1 (diff) | |
| parent | fd2a0d58c5d0aa0529d4ac65cc899f6d1109fb15 (diff) | |
| download | CMake-08f69324bb440ea873d78e271a3f360b9c558af7.zip CMake-08f69324bb440ea873d78e271a3f360b9c558af7.tar.gz CMake-08f69324bb440ea873d78e271a3f360b9c558af7.tar.bz2 | |
Merge topic 'wince-cmake-variable'
fd2a0d5 Set WINCE to 1 when building for WindowsCE
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 5cbf9ee..3a38d8f 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -41,6 +41,7 @@ set(WIN32 1) if(CMAKE_SYSTEM_NAME MATCHES "WindowsCE") set(CMAKE_CREATE_WIN32_EXE "/subsystem:windowsce /entry:WinMainCRTStartup") set(CMAKE_CREATE_CONSOLE_EXE "/subsystem:windowsce /entry:mainACRTStartup") + set(WINCE 1) else() set(CMAKE_CREATE_WIN32_EXE "/subsystem:windows") set(CMAKE_CREATE_CONSOLE_EXE "/subsystem:console") @@ -122,7 +123,7 @@ endif() # default to Debug builds set(CMAKE_BUILD_TYPE_INIT Debug) -if(CMAKE_SYSTEM_NAME MATCHES "WindowsCE") +if(WINCE) string(TOUPPER "${MSVC_C_ARCHITECTURE_ID}" _MSVC_C_ARCHITECTURE_ID_UPPER) string(TOUPPER "${MSVC_CXX_ARCHITECTURE_ID}" _MSVC_CXX_ARCHITECTURE_ID_UPPER) @@ -170,7 +171,7 @@ set(_MACHINE_ARCH_FLAG ${MSVC_C_ARCHITECTURE_ID}) if(NOT _MACHINE_ARCH_FLAG) set(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID}) endif() -if(CMAKE_SYSTEM_NAME MATCHES "WindowsCE") +if(WINCE) if(_MACHINE_ARCH_FLAG MATCHES "ARM") set(_MACHINE_ARCH_FLAG "THUMB") elseif(_MACHINE_ARCH_FLAG MATCHES "SH") |