From 05373f7ea79f950bf56657e6b5aabb02b34d4c76 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 28 Jul 2014 14:14:58 -0400 Subject: [PATCH] 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. --- Modules/Platform/Windows-MSVC.cmake | 3 --- 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 5b57ee767..2cfe6fef9 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 b158a9dfb..7e97111dc 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