You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2017/07/11 01:39:35 UTC
[49/50] mesos git commit: Windows: Set Unicode compilation flags.
Windows: Set Unicode compilation flags.
Review: https://reviews.apache.org/r/60345/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4b9daa29
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4b9daa29
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4b9daa29
Branch: refs/heads/master
Commit: 4b9daa2954006cdeadc6e1a436f820f714351886
Parents: 3373452
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Mon Jul 10 15:54:21 2017 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Mon Jul 10 17:15:40 2017 -0700
----------------------------------------------------------------------
cmake/CompilationConfigure.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/4b9daa29/cmake/CompilationConfigure.cmake
----------------------------------------------------------------------
diff --git a/cmake/CompilationConfigure.cmake b/cmake/CompilationConfigure.cmake
index 3fa2e2f..437300f 100644
--- a/cmake/CompilationConfigure.cmake
+++ b/cmake/CompilationConfigure.cmake
@@ -248,9 +248,9 @@ if (WIN32)
# NOTE: We APPEND ${CRT} rather than REPLACE so it gets picked up by
# dependencies.
foreach (lang C CXX)
- # Enable multi-threaded compilation.
+ # Enable multi-threaded and UNICODE compilation.
# NOTE: We do not add CRT here because dependencies will use it incorrectly.
- string(APPEND CMAKE_${lang}_FLAGS " /MP")
+ string(APPEND CMAKE_${lang}_FLAGS " /MP -DUNICODE -D_UNICODE")
# Debug library for debug configuration.
string(APPEND CMAKE_${lang}_FLAGS_DEBUG "${CRT}d")