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:57 UTC
[35/42] mesos git commit: CMake: Normalized trailing parentheses
style (stout).
CMake: Normalized trailing parentheses style (stout).
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/8ef80cf6
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8ef80cf6
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8ef80cf6
Branch: refs/heads/master
Commit: 8ef80cf629af1541c0b845bf5163deb88e79257e
Parents: d10fd9b
Author: Joseph Wu <jo...@apache.org>
Authored: Sun Sep 3 00:48:23 2017 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Sun Sep 3 05:51:09 2017 -0700
----------------------------------------------------------------------
3rdparty/stout/cmake/FindApr.cmake | 6 ++----
3rdparty/stout/cmake/FindSvn.cmake | 9 +++------
3rdparty/stout/tests/CMakeLists.txt | 18 +++++-------------
3 files changed, 10 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/8ef80cf6/3rdparty/stout/cmake/FindApr.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/stout/cmake/FindApr.cmake b/3rdparty/stout/cmake/FindApr.cmake
index 10e6d14..b6cc740 100644
--- a/3rdparty/stout/cmake/FindApr.cmake
+++ b/3rdparty/stout/cmake/FindApr.cmake
@@ -29,15 +29,13 @@ set(POSSIBLE_APR_INCLUDE_DIRS
/usr/local/include/apr-1.0
/usr/local/apr/include/apr-1
/usr/include/apr-1
- /usr/include/apr-1.0
- )
+ /usr/include/apr-1.0)
set(POSSIBLE_APR_LIB_DIRS
${APR_PREFIX}/libexec/lib
/usr/local/apr/lib
/usr/local/lib
- /usr/lib
- )
+ /usr/lib)
set(APR_LIBRARY_NAMES apr-1)
http://git-wip-us.apache.org/repos/asf/mesos/blob/8ef80cf6/3rdparty/stout/cmake/FindSvn.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/stout/cmake/FindSvn.cmake b/3rdparty/stout/cmake/FindSvn.cmake
index 15ec6ed..eed7590 100644
--- a/3rdparty/stout/cmake/FindSvn.cmake
+++ b/3rdparty/stout/cmake/FindSvn.cmake
@@ -26,19 +26,16 @@ execute_process(
set(POSSIBLE_SVN_INCLUDE_DIRS
${SVN_PREFIX}/include/subversion-1
/usr/include/subversion-1
- /usr/local/include/subversion-1
- )
+ /usr/local/include/subversion-1)
set(POSSIBLE_SVN_LIB_DIRS
${SVN_PREFIX}/lib
/usr/lib
- /usr/local/lib
- )
+ /usr/local/lib)
set(SVN_LIBRARY_NAMES
svn_delta-1
svn_diff-1
- svn_subr-1
- )
+ svn_subr-1)
FIND_PACKAGE_HELPER(SVN svn_client.h)
http://git-wip-us.apache.org/repos/asf/mesos/blob/8ef80cf6/3rdparty/stout/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/stout/tests/CMakeLists.txt b/3rdparty/stout/tests/CMakeLists.txt
index eb1c97e..8a87672 100644
--- a/3rdparty/stout/tests/CMakeLists.txt
+++ b/3rdparty/stout/tests/CMakeLists.txt
@@ -17,7 +17,6 @@
# STOUT TESTS.
##############
set(STOUT_ROOT_TESTS_SRC
- ${STOUT_ROOT_TESTS_SRC}
base64_tests.cpp
bits_tests.cpp
bytes_tests.cpp
@@ -53,35 +52,30 @@ set(STOUT_ROOT_TESTS_SRC
try_tests.cpp
uuid_tests.cpp
variant_tests.cpp
- version_tests.cpp
- )
+ version_tests.cpp)
if (NOT WIN32)
set(STOUT_ROOT_TESTS_SRC
${STOUT_ROOT_TESTS_SRC}
protobuf_tests.cpp
protobuf_tests.pb.cc
- svn_tests.cpp
- )
+ svn_tests.cpp)
endif ()
set(STOUT_OS_TESTS_SRC
- ${STOUT_OS_TESTS_SRC}
os/env_tests.cpp
os/filesystem_tests.cpp
os/process_tests.cpp
os/rmdir_tests.cpp
os/socket_tests.cpp
os/strerror_tests.cpp
- os/systems_tests.cpp
- )
+ os/systems_tests.cpp)
if (NOT WIN32)
set(STOUT_OS_TESTS_SRC
${STOUT_OS_TESTS_SRC}
os/sendfile_tests.cpp
- os/signals_tests.cpp
- )
+ os/signals_tests.cpp)
endif ()
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -89,11 +83,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
endif ()
set(STOUT_TESTS_SRC
- ${STOUT_TESTS_SRC}
${STOUT_HEADERS}
${STOUT_ROOT_TESTS_SRC}
- ${STOUT_OS_TESTS_SRC}
- )
+ ${STOUT_OS_TESTS_SRC})
# THE C++ PROTOCOL BUFFER CODE (protobuf_tests.pb.h and protobuf_tests.pb.cc).
##############################################################################