PARQUET-1313: [C++] Fix gtest build failure on Windows · apache/parquet-cpp@1c3a78e · 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 1c3a78e

Browse filesBrowse the repository at this point in the historyBrowse files

pitrou

committed

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

Also add an option to enable clcache if found.

1 parent c9bc237 commit 1c3a78e
Copy full SHA for 1c3a78e

2 files changed

+16Lines changed: 16 additions & 0 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• CMakeLists.txt
• 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

‎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)