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 1d3660f1e5a4447dabea31cc05a0d02e7dc64f22 (commit)
via 57849f33131d57750467819bd88fc07d959b2515 (commit)
from 948182700bccec42f8c68251df75e4cadcc663a4 (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=1d3660f1e5a4447dabea31cc05a0d02e7dc64f22
commit 1d3660f1e5a4447dabea31cc05a0d02e7dc64f22
Merge: 9481827 57849f3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Aug 27 09:45:57 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Aug 27 09:45:57 2014 -0400
Merge topic 'vs-windows-apps' into next
57849f33 MSVC: Define 'WIN32' for Windows Store and Windows Phone
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57849f33131d57750467819bd88fc07d959b2515
commit 57849f33131d57750467819bd88fc07d959b2515
Author: Gilles Khouzam <gill...@microsoft.com>
AuthorDate: Tue Aug 26 15:44:12 2014 -0700
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Aug 27 09:14:25 2014 -0400
MSVC: Define 'WIN32' for Windows Store and Windows Phone
This was accidentally left out of commit c72f0887 (MSVC: Add default
WindowsPhone and WindowsStore compile flags, 2014-07-28).
diff --git a/Modules/Platform/Windows-MSVC.cmake
b/Modules/Platform/Windows-MSVC.cmake
index 0c2e21b..a72f946 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -163,6 +163,7 @@ if(WINCE)
set(CMAKE_C_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}
corelibc.lib")
endif ()
elseif(WINDOWS_PHONE OR WINDOWS_STORE)
+ set(_PLATFORM_DEFINES "/DWIN32")
set(_FLAGS_C " /DUNICODE /D_UNICODE")
set(_FLAGS_CXX " /DUNICODE /D_UNICODE /GR /EHsc")
if(WINDOWS_PHONE)
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Windows-MSVC.cmake | 1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
