[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1897-g9c3ae36

[Brad King]

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  9c3ae36dcc572532e1e9c171cec41a04d9c4c580 (commit)
       via  fd2a0d58c5d0aa0529d4ac65cc899f6d1109fb15 (commit)
      from  d809b05a219b468bf2a2bd9488d9fad6dcb19552 (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=9c3ae36dcc572532e1e9c171cec41a04d9c4c580
commit 9c3ae36dcc572532e1e9c171cec41a04d9c4c580
Merge: d809b05 fd2a0d5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 4 09:55:14 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 4 09:55:14 2013 -0500

    Merge topic 'wince-cmake-variable' into next
    
    fd2a0d5 Set WINCE to 1 when building for WindowsCE


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd2a0d58c5d0aa0529d4ac65cc899f6d1109fb15
commit fd2a0d58c5d0aa0529d4ac65cc899f6d1109fb15
Author:     Patrick Gansterer <paroga at paroga.com>
AuthorDate: Fri Feb 1 23:23:09 2013 +0100
Commit:     Patrick Gansterer <paroga at paroga.com>
CommitDate: Fri Feb 1 23:26:03 2013 +0100

    Set WINCE to 1 when building for WindowsCE
    
    Introduce a new variable WINCE to make the WindowsCE
    system more easy to use in if statements.

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")

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Windows-MSVC.cmake |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake