diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-29 12:52:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-29 12:52:21 (GMT) |
| commit | 8cd83e0b71b71e30bdef81e275278f64abe42ce0 (patch) | |
| tree | cd96b425e984e494d4187a6f7027e563dc78302e /Modules | |
| parent | b5728f555d88fff4b014c44d4ebd4860980dbdbe (diff) | |
| parent | 7079f33d6ac00f9417d2d7aa222c8d0675ce3752 (diff) | |
| download | CMake-8cd83e0b71b71e30bdef81e275278f64abe42ce0.zip CMake-8cd83e0b71b71e30bdef81e275278f64abe42ce0.tar.gz CMake-8cd83e0b71b71e30bdef81e275278f64abe42ce0.tar.bz2 | |
Merge topic 'windows-ce-cleanup'
7079f33d WindowsCE: Drop unused Platform/WindowsCE-MSVC module
05373f7e WindowsCE: Refactor setting of "WINCE"
1acde6b0 MSVC: Use STREQUAL to check for WindowsCE
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 5 | ||||
| -rw-r--r-- | Modules/Platform/Windows.cmake | 4 | ||||
| -rw-r--r-- | Modules/Platform/WindowsCE-MSVC.cmake | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 8e988c9..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 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") - 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 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) |