This is an automated email from the ASF dual-hosted git repository.
wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 579fefb ARROW-4423: [C++] Upgrade vendored gmock/gtest to 1.8.1
579fefb is described below
commit 579fefbcd035f7e918728d66b2d32d6316102cdf
Author: Micah Kornfield <[email protected]>
AuthorDate: Tue Feb 12 11:12:08 2019 -0600
ARROW-4423: [C++] Upgrade vendored gmock/gtest to 1.8.1
This change seems to indicate an alternative would be to force the build to
be Release type (and avoid the naming magic). It doesn't appear that the conda
feedstock
(https://github.com/conda-forge/gtest-feedstock/blob/master/recipe/build.sh)
builds debug for linux at all. it does for windows though:
(https://github.com/conda-forge/gtest-feedstock/blob/master/recipe/bld.bat)
I'm not sure if we care a lot about this?
Author: Micah Kornfield <[email protected]>
Author: emkornfield <[email protected]>
Closes #3589 from emkornfield/upgrade_gmock and squashes the following
commits:
2df8f58c8 <emkornfield> fix case of "set"
200dec771 <Micah Kornfield> try naming for debug
e910d47fd <Micah Kornfield> remove hack for different vendored vs conda
gmock
af7740b69 <Micah Kornfield> Upgrade vendored gmock to 1.8.1
---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 24 +++++++++++-------------
cpp/thirdparty/versions.txt | 2 +-
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 5cfc95d..51bd39d 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -661,6 +661,13 @@ endif()
if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS)
if("${GTEST_HOME}" STREQUAL "")
set(GTEST_CMAKE_CXX_FLAGS ${EP_CXX_FLAGS})
+
+ if(CMAKE_BUILD_TYPE MATCHES DEBUG)
+ set(CMAKE_GTEST_DEBUG_EXTENSION "d")
+ else()
+ set(CMAKE_GTEST_DEBUG_EXTENSION "")
+ endif()
+
if(APPLE)
set(GTEST_CMAKE_CXX_FLAGS ${GTEST_CMAKE_CXX_FLAGS}
-DGTEST_USE_OWN_TR1_TUPLE=1
@@ -671,18 +678,18 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS)
set(GTEST_PREFIX
"${CMAKE_CURRENT_BINARY_DIR}/googletest_ep-prefix/src/googletest_ep")
set(GTEST_INCLUDE_DIR "${GTEST_PREFIX}/include")
set(GTEST_STATIC_LIB
-
"${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}")
+
"${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_GTEST_DEBUG_EXTENSION}${CMAKE_STATIC_LIBRARY_SUFFIX}")
set(GTEST_MAIN_STATIC_LIB
-
"${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}")
+
"${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_GTEST_DEBUG_EXTENSION}${CMAKE_STATIC_LIBRARY_SUFFIX}")
set(GTEST_VENDORED 1)
set(GTEST_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS}
"-DCMAKE_INSTALL_PREFIX=${GTEST_PREFIX}"
-DCMAKE_CXX_FLAGS=${GTEST_CMAKE_CXX_FLAGS})
set(GMOCK_INCLUDE_DIR "${GTEST_PREFIX}/include")
set(GMOCK_STATIC_LIB
-
"${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_STATIC_LIBRARY_SUFFIX}")
+
"${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gmock${CMAKE_GTEST_DEBUG_EXTENSION}${CMAKE_STATIC_LIBRARY_SUFFIX}")
set(GMOCK_MAIN_STATIC_LIB
-
"${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gmock_main${CMAKE_STATIC_LIBRARY_SUFFIX}")
+
"${GTEST_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gmock_main${CMAKE_GTEST_DEBUG_EXTENSION}${CMAKE_STATIC_LIBRARY_SUFFIX}")
if (MSVC AND NOT ARROW_USE_STATIC_CRT)
set(GTEST_CMAKE_ARGS ${GTEST_CMAKE_ARGS} -Dgtest_force_shared_crt=ON)
@@ -703,15 +710,6 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS)
message(STATUS "GTest include dir: ${GTEST_INCLUDE_DIR}")
message(STATUS "GMock include dir: ${GMOCK_INCLUDE_DIR}")
include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
- # Conflicts in header files seem to either cause apple to have
- # a bad boost symbol, or trusty to use CPP_TOOLCHAIN's header
- # file for gmock (and the vendored version is 1.8.0 and conda is
- # 1.8.1)
- if (APPLE)
- include_directories(SYSTEM ${GMOCK_INCLUDE_DIR})
- else()
- include_directories(BEFORE SYSTEM ${GMOCK_INCLUDE_DIR})
- endif()
if(GTEST_STATIC_LIB)
message(STATUS "GTest static library: ${GTEST_STATIC_LIB}")
message(STATUS "GMock static library: ${GMOCK_STATIC_LIB}")
diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt
index 37f53c7..40f599c 100644
--- a/cpp/thirdparty/versions.txt
+++ b/cpp/thirdparty/versions.txt
@@ -32,7 +32,7 @@ GBENCHMARK_VERSION=v1.4.1
GFLAGS_VERSION=v2.2.0
GLOG_VERSION=v0.3.5
GRPC_VERSION=v1.18.0
-GTEST_VERSION=1.8.0
+GTEST_VERSION=1.8.1
JEMALLOC_VERSION=17c897976c60b0e6e4f4a365c751027244dada7a
LZ4_VERSION=v1.8.3
ORC_VERSION=1.5.4
