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/09/03 12:51:58 UTC
[36/42] mesos git commit: CMake: Normalized trailing parentheses
style.
CMake: Normalized trailing parentheses style.
This removes dangling parentheses from CMake files setting variables
or calling functions.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3628c39f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3628c39f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3628c39f
Branch: refs/heads/master
Commit: 3628c39fb38a99bfc6b5747b5856d99ad4404332
Parents: 21f7837
Author: Joseph Wu <jo...@apache.org>
Authored: Sun Sep 3 00:43:41 2017 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Sun Sep 3 05:51:09 2017 -0700
----------------------------------------------------------------------
3rdparty/cmake/PatchCommand.cmake | 3 +--
3rdparty/http-parser/CMakeLists.txt.template | 4 +---
CMakeLists.txt | 3 +--
cmake/CompilationConfigure.cmake | 15 +++++----------
cmake/MesosConfigure.cmake | 3 +--
src/CMakeLists.txt | 3 +--
6 files changed, 10 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/3628c39f/3rdparty/cmake/PatchCommand.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/cmake/PatchCommand.cmake b/3rdparty/cmake/PatchCommand.cmake
index 4dd6639..d4353d8 100644
--- a/3rdparty/cmake/PatchCommand.cmake
+++ b/3rdparty/cmake/PatchCommand.cmake
@@ -37,8 +37,7 @@ if (WIN32)
"Also delete CMakeCache.txt to clear the cache. "
"Mesos for Windows requires GnuWin32 patch.exe "
"to apply updates. You may get it from "
- "http://gnuwin32.sourceforge.net/packages/patch.htm"
- )
+ "http://gnuwin32.sourceforge.net/packages/patch.htm")
else ()
message(
STATUS
http://git-wip-us.apache.org/repos/asf/mesos/blob/3628c39f/3rdparty/http-parser/CMakeLists.txt.template
----------------------------------------------------------------------
diff --git a/3rdparty/http-parser/CMakeLists.txt.template b/3rdparty/http-parser/CMakeLists.txt.template
index 9a67197..4ad3db0 100644
--- a/3rdparty/http-parser/CMakeLists.txt.template
+++ b/3rdparty/http-parser/CMakeLists.txt.template
@@ -26,10 +26,8 @@ project(http-parser)
include_directories(.)
set(HTTP_PARSER_SRC
- ${HTTP_PARSER_SRC}
http_parser.c
- http_parser.h
- )
+ http_parser.h)
add_definitions(-D HTTP_PARSER_STRICT=0)
add_definitions(-fPIC)
http://git-wip-us.apache.org/repos/asf/mesos/blob/3628c39f/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b506c78..e08fcef 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,8 +81,7 @@ set(CPACK_SOURCE_IGNORE_FILES
/mpi/;
/site/;
/support/;
- ${CMAKE_BINARY_DIR};
- )
+ ${CMAKE_BINARY_DIR};)
# Convert the ignore list to a string (as required by CPack).
set(CPACK_SOURCE_IGNORE_FILES "${CPACK_SOURCE_IGNORE_FILES}")
http://git-wip-us.apache.org/repos/asf/mesos/blob/3628c39f/cmake/CompilationConfigure.cmake
----------------------------------------------------------------------
diff --git a/cmake/CompilationConfigure.cmake b/cmake/CompilationConfigure.cmake
index 9aca1ca..9f692b0 100644
--- a/cmake/CompilationConfigure.cmake
+++ b/cmake/CompilationConfigure.cmake
@@ -80,8 +80,7 @@ if (WIN32)
message(
FATAL_ERROR
"The x64 toolset MUST be used. See MESOS-6720 for details. "
- "Please use `cmake -T ${PREFERRED_TOOLSET}`."
- )
+ "Please use `cmake -T ${PREFERRED_TOOLSET}`.")
endif ()
endif ()
@@ -188,8 +187,7 @@ if (WIN32)
message(
WARNING
"Mesos is deprecating support for ${CMAKE_GENERATOR}. "
- "Please use ${PREFERRED_GENERATOR}."
- )
+ "Please use ${PREFERRED_GENERATOR}.")
endif ()
# We don't support compilation against mingw headers (which, e.g., Clang on
@@ -299,8 +297,7 @@ if (WIN32)
list(APPEND MESOS_CPPFLAGS
-D_SCL_SECURE_NO_WARNINGS
-D_CRT_SECURE_NO_WARNINGS
- -D_CRT_NONSTDC_NO_WARNINGS
- )
+ -D_CRT_NONSTDC_NO_WARNINGS)
# Directory structure definitions.
# TODO(hausdorff): (MESOS-5455) These are placeholder values.
@@ -328,8 +325,7 @@ list(APPEND MESOS_CPPFLAGS
-DPKGLIBEXECDIR="${PKG_LIBEXEC_INSTALL_DIR}"
-DLIBDIR="${LIB_INSTALL_DIR}"
-DVERSION="${PACKAGE_VERSION}"
- -DPKGDATADIR="${DATA_INSTALL_PREFIX}"
- )
+ -DPKGDATADIR="${DATA_INSTALL_PREFIX}")
if (ENABLE_SSL)
list(APPEND MESOS_CPPFLAGS -DUSE_SSL_SOCKET=1)
@@ -375,8 +371,7 @@ endif ()
configure_file(
"${CMAKE_SOURCE_DIR}/src/common/build_config.hpp.in"
"${CMAKE_BINARY_DIR}/src/common/build_config.hpp"
- @ONLY
- )
+ @ONLY)
# NOTE: The quotes in these definitions are necessary. Without them, the
# preprocessor will interpret the symbols as (e.g.) int literals and uquoted
http://git-wip-us.apache.org/repos/asf/mesos/blob/3628c39f/cmake/MesosConfigure.cmake
----------------------------------------------------------------------
diff --git a/cmake/MesosConfigure.cmake b/cmake/MesosConfigure.cmake
index c5435f8..0954a9c 100644
--- a/cmake/MesosConfigure.cmake
+++ b/cmake/MesosConfigure.cmake
@@ -65,8 +65,7 @@ set(
${MESOS_BIN_INCLUDE_DIR}
${MESOS_BIN_INCLUDE_DIR}/mesos
${MESOS_BIN_SRC_DIR}
- ${MESOS_SRC_DIR}
- )
+ ${MESOS_SRC_DIR})
# Make directories that generated Mesos code goes into.
add_custom_target(
http://git-wip-us.apache.org/repos/asf/mesos/blob/3628c39f/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 18fb4c1..590e981 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -561,8 +561,7 @@ set(MESOS_SRC
${V1_SRC}
${VERSION_SRC}
${WATCHER_SRC}
- ${ZOOKEEPER_SRC}
- )
+ ${ZOOKEEPER_SRC})
if (NOT WIN32)
set(MESOS_SRC