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 2016/11/29 00:20:31 UTC
[02/23] mesos git commit: CMake: Remove test-specific variables from
ProcessTestsConfigure.
CMake: Remove test-specific variables from ProcessTestsConfigure.
The removed definitions are now defined in:
`3rdparty/stout/cmake/StoutTestsConfigure.cmake`
Review: https://reviews.apache.org/r/53962/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4d969856
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4d969856
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4d969856
Branch: refs/heads/master
Commit: 4d9698560d6b09ea32f36fed6c78e5cebcaa6402
Parents: f4a6959
Author: Joseph Wu <jo...@mesosphere.io>
Authored: Mon Nov 28 15:32:29 2016 -0800
Committer: Joseph Wu <jo...@apache.org>
Committed: Mon Nov 28 15:32:29 2016 -0800
----------------------------------------------------------------------
.../cmake/ProcessTestsConfigure.cmake | 50 +-------------------
1 file changed, 1 insertion(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/4d969856/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake b/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake
index c73c7a4..9817426 100644
--- a/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake
+++ b/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake
@@ -14,60 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-###############################################################
-# Defines the variables useful for tests, and exports them to the scope of
-# whatever file includes this file. There are a few important consequence of this:
-#
-# * This file MUST be included before the third-party dependencies like gmock
-# are configured/built/downloaded (if you're doing this). If this code isn't
-# run first, then we won't know (e.g.) what folders to unpack the code to.
-# * This file ONLY defines and exports variables for third-party dependencies
-# that are required by the test suite, but are not a dependency that
-# libprocess core takes. That is, this file handles the gmock dependency,
-# but not the glog dependency (which the process library itself takes a
-# dependency on).
-# * This file and the config file for the libprocess "core" dependencies (e.g.,
-# glog, boost, etc.) so that we can export the variables for the core
-# dependencies (e.g., where to find the .so/.dll files) without having to also
-# export the variables for the dependencies that only the test package has.
+include(StoutTestsConfigure)
set(
PROCESS_TESTS_TARGET process_tests
CACHE STRING "Target we use to refer to tests for the process library")
-# DIRECTORY STRUCTURE FOR THIRD-PARTY LIBS REQUIRED FOR TEST INFRASTRUCTURE.
-############################################################################
-EXTERNAL("gmock" ${GMOCK_VERSION} "${MESOS_3RDPARTY_BIN}")
-
-set(GTEST_SRC ${GMOCK_ROOT}/gtest)
-set(GPERFTOOLS_VERSION 2.0)
-set(GPERFTOOLS ${MESOS_3RDPARTY_BIN}/gperftools-${GPERFTOOLS_VERSION})
-
-# Convenience variables for include directories of third-party dependencies.
-set(GMOCK_INCLUDE_DIR ${GMOCK_ROOT}/include)
-set(GTEST_INCLUDE_DIR ${GTEST_SRC}/include)
-
-# Convenience variables for `lib` directories of built third-party dependencies.
-if (WIN32)
- set(GMOCK_LIB_DIR ${GMOCK_ROOT}-build/${CMAKE_BUILD_TYPE})
- set(GTEST_LIB_DIR ${GMOCK_ROOT}-build/gtest/${CMAKE_BUILD_TYPE})
-else (WIN32)
- set(GMOCK_LIB_DIR ${GMOCK_ROOT}-lib/lib/)
- set(GTEST_LIB_DIR ${GMOCK_ROOT}-build/gtest/lib/.libs)
-endif (WIN32)
-
-# Convenience variables for "lflags", the symbols we pass to CMake to generate
-# things like `-L/path/to/glog` or `-lglog`.
-set(GMOCK_LFLAG gmock)
-set(GTEST_LFLAG gtest)
-
-# COMPILER CONFIGURATION.
-#########################
-if (APPLE)
- # GTEST on OSX needs its own tr1 tuple.
- add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=1 -DGTEST_LANG_CXX11)
-endif (APPLE)
-
# DEFINE PROCESS TEST LIBRARY DEPENDENCIES. Tells the process library build
# tests target download/configure/build all third-party libraries before
# attempting to build.