Repository: mesos Updated Branches: refs/heads/master 69d7e8e37 -> 5f67bdee4
CMake: Corrected linking path for gmock libraries on Windows builds. Review: https://reviews.apache.org/r/39621 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5a5bd05f Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5a5bd05f Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5a5bd05f Branch: refs/heads/master Commit: 5a5bd05ffa22f3bef7ae3edc78c3c9b8a7f27f69 Parents: 69d7e8e Author: Alex Clemmer <[email protected]> Authored: Fri Dec 11 13:45:48 2015 -0800 Committer: Joris Van Remoortere <[email protected]> Committed: Fri Dec 11 13:56:14 2015 -0800 ---------------------------------------------------------------------- 3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/5a5bd05f/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake b/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake index 6eda46b..3a2e099 100644 --- a/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake +++ b/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake @@ -49,8 +49,8 @@ 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}/msvc/2010/Debug) - set(GTEST_LIB_DIR ${GMOCK_ROOT}-build/gtest/Debug) + 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)
