[Cmake-commits] CMake branch, next, updated. v3.0.0-4559-g4dbe189

[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  4dbe18970588193b9b181bd6c8b5102bb2cfb1c9 (commit)
       via  7079f33d6ac00f9417d2d7aa222c8d0675ce3752 (commit)
       via  05373f7ea79f950bf56657e6b5aabb02b34d4c76 (commit)
       via  1acde6b003812e9964bdf67db5c1ce68a566e675 (commit)
      from  2a4a4c3f152c7de8ca4cf13170d0ddbfdb587274 (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=4dbe18970588193b9b181bd6c8b5102bb2cfb1c9
commit 4dbe18970588193b9b181bd6c8b5102bb2cfb1c9
Merge: 2a4a4c3 7079f33
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 28 16:23:04 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 28 16:23:04 2014 -0400

    Merge topic 'windows-ce-cleanup' into next
    
    7079f33d WindowsCE: Drop unused Platform/WindowsCE-MSVC module
    05373f7e WindowsCE: Refactor setting of "WINCE"
    1acde6b0 MSVC: Use STREQUAL to check for WindowsCE


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7079f33d6ac00f9417d2d7aa222c8d0675ce3752
commit 7079f33d6ac00f9417d2d7aa222c8d0675ce3752
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 28 14:06:52 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 28 16:21:50 2014 -0400

    WindowsCE: Drop unused Platform/WindowsCE-MSVC module
    
    This module was created to mirror Platform/Windows-MSVC.cmake, but this
    is not necessary because nothing includes "Platform/<os>-<id>.cmake"
    directly.  The Platform/Windows-MSVC module is only a helper for the
    Platform/Windows-MSVC-<lang> modules.

diff --git a/Modules/Platform/WindowsCE-MSVC.cmake b/Modules/Platform/WindowsCE-MSVC.cmake
deleted file mode 100644
index d28b4ab..0000000
--- a/Modules/Platform/WindowsCE-MSVC.cmake
+++ /dev/null
@@ -1 +0,0 @@
-include(Platform/Windows-MSVC)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05373f7ea79f950bf56657e6b5aabb02b34d4c76
commit 05373f7ea79f950bf56657e6b5aabb02b34d4c76
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 28 14:14:58 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 28 16:21:47 2014 -0400

    WindowsCE: Refactor setting of "WINCE"
    
    Move it to the Platform/Windows module since it is independent of the
    compiler used.  While at it, remove redundant "WIN32" setting from
    Platform/Windows-MSVC since Plaform/Windows already sets its.

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 5b57ee7..2cfe6fe 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -36,13 +36,10 @@ else()
   set(CMAKE_CL_NOLOGO "/nologo")
 endif()
 
-set(WIN32 1)
-
 if(CMAKE_SYSTEM_NAME STREQUAL "WindowsCE")
   set(CMAKE_CREATE_WIN32_EXE "/entry:WinMainCRTStartup")
   set(CMAKE_CREATE_CONSOLE_EXE "/entry:mainACRTStartup")
   set(_PLATFORM_LINK_FLAGS " /subsystem:windowsce")
-  set(WINCE 1)
 else()
   set(CMAKE_CREATE_WIN32_EXE "/subsystem:windows")
   set(CMAKE_CREATE_CONSOLE_EXE "/subsystem:console")
diff --git a/Modules/Platform/Windows.cmake b/Modules/Platform/Windows.cmake
index b158a9d..7e97111 100644
--- a/Modules/Platform/Windows.cmake
+++ b/Modules/Platform/Windows.cmake
@@ -1,5 +1,9 @@
 set(WIN32 1)
 
+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsCE")
+  set(WINCE 1)
+endif()
+
 set(CMAKE_STATIC_LIBRARY_PREFIX "")
 set(CMAKE_STATIC_LIBRARY_SUFFIX ".lib")
 set(CMAKE_SHARED_LIBRARY_PREFIX "")          # lib

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1acde6b003812e9964bdf67db5c1ce68a566e675
commit 1acde6b003812e9964bdf67db5c1ce68a566e675
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 28 14:12:39 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 28 16:21:45 2014 -0400

    MSVC: Use STREQUAL to check for WindowsCE
    
    In the Platform/Windows-MSVC module it is not necessary to use MATCHES
    because we are comparing against an exact string.

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 8e988c9..5b57ee7 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -38,7 +38,7 @@ endif()
 
 set(WIN32 1)
 
-if(CMAKE_SYSTEM_NAME MATCHES "WindowsCE")
+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsCE")
   set(CMAKE_CREATE_WIN32_EXE "/entry:WinMainCRTStartup")
   set(CMAKE_CREATE_CONSOLE_EXE "/entry:mainACRTStartup")
   set(_PLATFORM_LINK_FLAGS " /subsystem:windowsce")

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

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


hooks/post-receive
-- 
CMake