You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ec...@apache.org on 2017/07/25 15:36:23 UTC
geode-native git commit: GEODE-3173: Upgrade to gtest 1.8
Repository: geode-native
Updated Branches:
refs/heads/develop 5dcff096e -> d3c34c1d5
GEODE-3173: Upgrade to gtest 1.8
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/d3c34c1d
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/d3c34c1d
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/d3c34c1d
Branch: refs/heads/develop
Commit: d3c34c1d593388a1ebec9a053a066f43f172c63f
Parents: 5dcff09
Author: David Kimura <dk...@pivotal.io>
Authored: Thu Jul 6 17:25:25 2017 -0700
Committer: Ernest Burghardt <eb...@pivotal.io>
Committed: Tue Jul 25 09:33:40 2017 -0600
----------------------------------------------------------------------
src/dependencies/gtest/CMakeLists.txt | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/d3c34c1d/src/dependencies/gtest/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/dependencies/gtest/CMakeLists.txt b/src/dependencies/gtest/CMakeLists.txt
index 65a4616..bfbc496 100644
--- a/src/dependencies/gtest/CMakeLists.txt
+++ b/src/dependencies/gtest/CMakeLists.txt
@@ -15,8 +15,8 @@
cmake_minimum_required( VERSION 3.4 )
project( gtest )
-set( ${PROJECT_NAME}_VERSION 1.7.0 )
-set( ${PROJECT_NAME}_SHA265 b58cb7547a28b2c718d1e38aee18a3659c9e3ff52440297e965f5edffe34b6d0 )
+set( ${PROJECT_NAME}_VERSION 1.8.0 )
+set( ${PROJECT_NAME}_SHA265 f3ed3b58511efd272eb074a3a6d6fb79d7c2e6a0e374323d1e6bcbcc1ef141bf )
set( ${PROJECT_NAME}_URL "https://github.com/google/googletest/archive/release-${${PROJECT_NAME}_VERSION}.zip" )
set( ${PROJECT_NAME}_EXTERN ${PROJECT_NAME}-extern )
@@ -35,21 +35,26 @@ ExternalProject_Add( ${${PROJECT_NAME}_EXTERN}
)
ExternalProject_Get_Property( ${${PROJECT_NAME}_EXTERN} SOURCE_DIR )
-set( ${PROJECT_NAME}_SOURCE_DIR ${SOURCE_DIR} )
+set( ${PROJECT_NAME}_SOURCE_DIR ${SOURCE_DIR}/googletest )
+set( gmock_SOURCE_DIR ${SOURCE_DIR}/googlemock )
ExternalProject_Get_Property( ${${PROJECT_NAME}_EXTERN} INSTALL_DIR )
set( ${PROJECT_NAME}_INSTALL_DIR ${INSTALL_DIR} )
ExternalProject_Get_Property( ${${PROJECT_NAME}_EXTERN} BINARY_DIR )
-set( ${PROJECT_NAME}_BINARY_DIR ${BINARY_DIR}/${_DEBUG_OR_RELEASE} )
+set( ${PROJECT_NAME}_BINARY_DIR ${BINARY_DIR}/${_DEBUG_OR_RELEASE}/googlemock/gtest/ )
+set( gmock_BINARY_DIR ${BINARY_DIR}/${_DEBUG_OR_RELEASE}/googlemock )
set( DEPENDENCIES_${PROJECT_NAME}_DIR ${${PROJECT_NAME}_BINARY_DIR} PARENT_SCOPE)
set( ${PROJECT_NAME}_STATIC_LIB
${${PROJECT_NAME}_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${PROJECT_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
${${PROJECT_NAME}_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${PROJECT_NAME}_main${CMAKE_STATIC_LIBRARY_SUFFIX}
+${gmock_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}
+${gmock_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX}
PARENT_SCOPE)
add_library(${PROJECT_NAME} INTERFACE)
target_include_directories(${PROJECT_NAME} INTERFACE
$<BUILD_INTERFACE:${${PROJECT_NAME}_SOURCE_DIR}/include>
+ $<BUILD_INTERFACE:${gmock_SOURCE_DIR}/include>
)
target_link_libraries(${PROJECT_NAME} INTERFACE
${${PROJECT_NAME}_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${PROJECT_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
@@ -59,6 +64,7 @@ add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXTERN})
add_library(${PROJECT_NAME}_main INTERFACE)
target_include_directories(${PROJECT_NAME}_main INTERFACE
$<BUILD_INTERFACE:${${PROJECT_NAME}_SOURCE_DIR}/include>
+ $<BUILD_INTERFACE:${gmock_SOURCE_DIR}/include>
)
target_link_libraries(${PROJECT_NAME}_main INTERFACE
${${PROJECT_NAME}_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${PROJECT_NAME}_main${CMAKE_STATIC_LIBRARY_SUFFIX}