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/05/15 17:52:56 UTC
mesos git commit: CMake: Reverts usage of `string(APPEND ...)`.
Repository: mesos
Updated Branches:
refs/heads/master 4e0a30f66 -> 47562d9bb
CMake: Reverts usage of `string(APPEND ...)`.
This partially reverts commit 4ce689c8e2be386d0086acce63ce5b8bbab6c34b.
`string(APPEND ...)` was added in CMake 3.4, but the earliest required
version of CMake is 2.8.12. `list(APPEND ...)` exists in 2.8.12,
so that pattern will not be reverted.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/47562d9b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/47562d9b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/47562d9b
Branch: refs/heads/master
Commit: 47562d9bbbb25a715eb174ad9738d6d188dd6bfe
Parents: 4e0a30f
Author: Joseph Wu <jo...@apache.org>
Authored: Mon May 15 10:50:43 2017 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Mon May 15 10:51:58 2017 -0700
----------------------------------------------------------------------
cmake/CompilationConfigure.cmake | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/47562d9b/cmake/CompilationConfigure.cmake
----------------------------------------------------------------------
diff --git a/cmake/CompilationConfigure.cmake b/cmake/CompilationConfigure.cmake
index 0567b74..a0032a3 100644
--- a/cmake/CompilationConfigure.cmake
+++ b/cmake/CompilationConfigure.cmake
@@ -206,7 +206,7 @@ if (NOT WIN32)
"flag. Please use a different C++ compiler.")
endif (NOT COMPILER_SUPPORTS_CXX11)
- string(APPEND CMAKE_CXX_FLAGS " -std=c++11")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
# Directory structure for some build artifacts.
# This is defined for use in tests.
@@ -236,15 +236,15 @@ if (WIN32)
# COFF/PE and friends are somewhat limited in the number of sections they
# allow for an object file. We use this to avoid those problems.
- string(APPEND CMAKE_CXX_FLAGS
- " /bigobj -DGOOGLE_GLOG_DLL_DECL= -DCURL_STATICLIB /vd2")
+ set(CMAKE_CXX_FLAGS
+ "${CMAKE_CXX_FLAGS} /bigobj -DGOOGLE_GLOG_DLL_DECL= -DCURL_STATICLIB /vd2")
# Enable multi-threaded compilation.
- string(APPEND CMAKE_CXX_FLAGS " /MP")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
# Build against the multi-threaded, static version of the runtime library.
- string(APPEND CMAKE_CXX_FLAGS_DEBUG " /MTd")
- string(APPEND CMAKE_CXX_FLAGS_RELEASE " /MT")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
# Convenience flags to simplify Windows support in C++ source; used to
# `#ifdef` out some platform-specific parts of Mesos. We choose to define