diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-28 18:14:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-28 20:21:47 (GMT) |
| commit | 05373f7ea79f950bf56657e6b5aabb02b34d4c76 (patch) | |
| tree | d51fd0e0db2e5f68b9011fdf6b1a8660eacad3eb /Modules/Platform | |
| parent | 1acde6b003812e9964bdf67db5c1ce68a566e675 (diff) | |
| download | CMake-05373f7ea79f950bf56657e6b5aabb02b34d4c76.zip CMake-05373f7ea79f950bf56657e6b5aabb02b34d4c76.tar.gz CMake-05373f7ea79f950bf56657e6b5aabb02b34d4c76.tar.bz2 | |
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.
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 3 | ||||
| -rw-r--r-- | Modules/Platform/Windows.cmake | 4 |
2 files changed, 4 insertions, 3 deletions
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 |