geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From echobr...@apache.org
Subject geode-native git commit: GEODE-3173: fixes Windows build break for gtest.
Date Tue, 25 Jul 2017 18:11:17 GMT
Repository: geode-native
Updated Branches:
  refs/heads/develop fc4af401b -> e8fd46df5


GEODE-3173: fixes Windows build break for gtest.


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

Branch: refs/heads/develop
Commit: e8fd46df5a018a3c818e87dea98630199cf70845
Parents: fc4af40
Author: Ernest Burghardt <eburghardt@pivotal.io>
Authored: Tue Jul 25 12:10:01 2017 -0600
Committer: Ernest Burghardt <eburghardt@pivotal.io>
Committed: Tue Jul 25 12:10:42 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/e8fd46df/src/dependencies/gtest/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/dependencies/gtest/CMakeLists.txt b/src/dependencies/gtest/CMakeLists.txt
index 067760b..26f5bf7 100644
--- a/src/dependencies/gtest/CMakeLists.txt
+++ b/src/dependencies/gtest/CMakeLists.txt
@@ -40,7 +40,7 @@ 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}/googlemock/gtest/ )
+set( ${PROJECT_NAME}_BINARY_DIR ${BINARY_DIR}/googlemock/gtest//${_DEBUG_OR_RELEASE} )
 set( gmock_BINARY_DIR ${BINARY_DIR}/googlemock//${_DEBUG_OR_RELEASE} )
 set( DEPENDENCIES_${PROJECT_NAME}_DIR ${${PROJECT_NAME}_BINARY_DIR} PARENT_SCOPE)
 


Mime
View raw message