geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From echobr...@apache.org
Subject [1/2] geode-native git commit: GEODE-3173: fixes Windows build break.
Date Tue, 25 Jul 2017 17:28:13 GMT
Repository: geode-native
Updated Branches:
  refs/heads/develop d3c34c1d5 -> fc4af401b


GEODE-3173: fixes Windows build break.


Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/8f097d9e
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/8f097d9e
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/8f097d9e

Branch: refs/heads/develop
Commit: 8f097d9e6d87c35d844e695796a6611fdf4184fb
Parents: d3c34c1
Author: Ernest Burghardt <eburghardt@pivotal.io>
Authored: Tue Jul 25 11:25:50 2017 -0600
Committer: Ernest Burghardt <eburghardt@pivotal.io>
Committed: Tue Jul 25 11:25:50 2017 -0600

----------------------------------------------------------------------
 src/dependencies/gtest/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/8f097d9e/src/dependencies/gtest/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/dependencies/gtest/CMakeLists.txt b/src/dependencies/gtest/CMakeLists.txt
index bfbc496..067760b 100644
--- a/src/dependencies/gtest/CMakeLists.txt
+++ b/src/dependencies/gtest/CMakeLists.txt
@@ -41,7 +41,7 @@ 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}/googlemock/gtest/ )
-set( gmock_BINARY_DIR ${BINARY_DIR}/${_DEBUG_OR_RELEASE}/googlemock )
+set( gmock_BINARY_DIR ${BINARY_DIR}/googlemock//${_DEBUG_OR_RELEASE} )
 set( DEPENDENCIES_${PROJECT_NAME}_DIR ${${PROJECT_NAME}_BINARY_DIR} PARENT_SCOPE)
 
 set( ${PROJECT_NAME}_STATIC_LIB


Mime
View raw message