PARQUET-1313: [C++] Fix gtest build failure on Windows · apache/parquet-cpp@7c163ea · GitHub

This repository was archived by the owner on May 10, 2024. It is now read-only.

apache / parquet-cpp Public archive

• Notifications You must be signed in to change notification settings
• Fork 186
• Star 446

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 7c163ea

Browse filesBrowse the repository at this point in the historyBrowse files

pitrou

authored and

xhochy

committed

PARQUET-1313: [C++] Fix gtest build failure on Windows

Also add an option to enable clcache if found. Author: Antoine Pitrou <antoine@python.org> Closes #468 from pitrou/PARQUET-1313-msvc-gtest-warnings and squashes the following commits: 7aefdcf [Antoine Pitrou] Enable a VS2017 build on AppVeyor 1c3a78e [Antoine Pitrou] PARQUET-1313: [C++] Fix gtest build failure on Windows

1 parent 1ea4be8 commit 7c163ea
Copy full SHA for 7c163ea

4 files changed

+41-5Lines changed: 41 additions & 5 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• CMakeLists.txt
• appveyor.yml
• ci
  • msvc-build.bat
• cmake_modules
  • ThirdpartyToolchain.cmake

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎CMakeLists.txt‎

Copy file name to clipboardExpand all lines: CMakeLists.txt

+12Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -164,6 +164,9 @@ if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
164	164	option(PARQUET_USE_STATIC_CRT
165	165	"Build Parquet with statically linked CRT"
166	166	OFF)
	167	+ option(PARQUET_USE_CLCACHE
	168	+ "Use clcache if available"
	169	+ ON)
167	170	endif()
168	171
169	172	option(PARQUET_VERBOSE_THIRDPARTY_BUILD
@@ -172,6 +175,15 @@ if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
172	175
173	176	endif()
174	177
	178	+ if (MSVC AND PARQUET_USE_CLCACHE AND
	179	+ (("${CMAKE_GENERATOR}" STREQUAL "NMake Makefiles") OR
	180	+ ("${CMAKE_GENERATOR}" STREQUAL "Ninja")))
	181	+ find_program(CLCACHE_FOUND clcache)
	182	+ if(CLCACHE_FOUND)
	183	+ set(CMAKE_CXX_COMPILER ${CLCACHE_FOUND})
	184	+ endif(CLCACHE_FOUND)
	185	+ endif()
	186	+
175	187	include(BuildUtils)
176	188
177	189	if (PARQUET_BUILD_TESTS OR PARQUET_BUILD_EXECUTABLES OR PARQUET_BUILD_BENCHMARKS)

Collapse file

‎appveyor.yml‎

Copy file name to clipboardExpand all lines: appveyor.yml

+11-2Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -18,6 +18,9 @@
18	18	# Operating system (build VM template)
19	19	os: Visual Studio 2015
20	20
	21	+ matrix:
	22	+ fast_finish: true
	23	+
21	24	environment:
22	25	matrix:
23	26	- GENERATOR: NMake Makefiles
@@ -28,10 +31,12 @@ environment:
28	31	PYTHON: "3.5"
29	32	ARCH: "64"
30	33	CONFIGURATION: "Debug"
31		- - GENERATOR: Visual Studio 14 2015 Win64
	34	+ - GENERATOR: Visual Studio 15 2017 Win64
32	35	PYTHON: "3.5"
33	36	ARCH: "64"
34	37	CONFIGURATION: "Release"
	38	+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
	39	+ BOOST_ROOT: C:\Libraries\boost_1_64_0
35	40	- GENERATOR: Visual Studio 14 2015 Win64
36	41	PYTHON: "3.5"
37	42	ARCH: "64"
@@ -46,14 +51,18 @@ environment:
46	51	PYTHON: "3.5"
47	52	ARCH: "64"
48	53	CONFIGURATION: "Toolchain"
	54	+
49	55	MSVC_DEFAULT_OPTIONS: ON
50	56	BOOST_ROOT: C:\Libraries\boost_1_63_0
51	57	BOOST_LIBRARYDIR: C:\Libraries\boost_1_63_0\lib64-msvc-14.0
	58	+ USE_CLCACHE: false
52	59
53	60	init:
54	61	- set MINICONDA=C:\Miniconda35-x64
55	62	- set PATH=%MINICONDA%;%MINICONDA%/Scripts;%MINICONDA%/Library/bin;%PATH%
56		- - if "%GENERATOR%"=="NMake Makefiles" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
57	63
58	64	build_script:
59	65	- call ci\msvc-build.bat
	66	+
	67	+ # Disable test discovery
	68	+ test: off

Collapse file

‎ci/msvc-build.bat‎

Copy file name to clipboardExpand all lines: ci/msvc-build.bat

+14-3Lines changed: 14 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -32,6 +32,17 @@ if NOT "%CONFIGURATION%" == "Debug" (
32	32	set PARQUET_CXXFLAGS="%PARQUET_CXXFLAGS% /WX"
33	33	)
34	34
	35	+ if "%GENERATOR%"=="NMake Makefiles" set need_vcvarsall=1
	36	+
	37	+ if defined need_vcvarsall (
	38	+ @rem Select desired compiler version
	39	+ if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" (
	40	+ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
	41	+ ) else (
	42	+ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
	43	+ )
	44	+ )
	45	+
35	46	if "%CONFIGURATION%" == "Toolchain" (
36	47	conda install -y boost-cpp=1.63 thrift-cpp=0.11.0 ^
37	48	brotli=0.6.0 zlib=1.2.11 snappy=1.1.6 lz4-c=1.7.5 zstd=1.2.0 ^
@@ -47,7 +58,6 @@ if "%CONFIGURATION%" == "Toolchain" (
47	58	.. || exit /B
48	59
49	60	cmake --build . --config Release || exit /B
50		- ctest -VV || exit /B
51	61	)
52	62
53	63	if NOT "%CONFIGURATION%" == "Toolchain" (
@@ -59,8 +69,9 @@ if NOT "%CONFIGURATION%" == "Toolchain" (
59	69	.. || exit /B
60	70
61	71	cmake --build . --config %CONFIGURATION% || exit /B
	72	+ )
62	73
63		- if "%CONFIGURATION%" == "Release" (
	74	+ if NOT "%CONFIGURATION%" == "Debug" (
	75	+ @rem Tests are too slow and/or hang in debug mode
64	76	ctest -VV || exit /B
65		- )
66	77	)

Collapse file

‎cmake_modules/ThirdpartyToolchain.cmake‎

Copy file name to clipboardExpand all lines: cmake_modules/ThirdpartyToolchain.cmake

+4Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -287,6 +287,10 @@ if(PARQUET_BUILD_TESTS AND NOT IGNORE_OPTIONAL_PACKAGES)
287	287	if("$ENV{GTEST_HOME}" STREQUAL "")
288	288	if(APPLE)
289	289	set(GTEST_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1 -Wno-unused-value -Wno-ignored-attributes")
	290	+ elseif(MSVC)
	291	+ # Workaround https://github.com/google/googletest/issues/1111 until
	292	+ # a new gtest version is released
	293	+ set(GTEST_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS} -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING")
290	294	else()
291	295	set(GTEST_CMAKE_CXX_FLAGS "${EP_CXX_FLAGS}")
292	296	endif()

0 commit comments

Comments

0 (0)