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 ce95db3 ARROW-1931: [C++] Suppress C4996 deprecation warning in MSVC
builds for now
ce95db3 is described below
commit ce95db3e3a678ac391125bd899c7ec4f1bbf4b97
Author: Wes McKinney <[email protected]>
AuthorDate: Thu Dec 21 17:11:52 2017 -0500
ARROW-1931: [C++] Suppress C4996 deprecation warning in MSVC builds for now
It's reasonably harmless to suppress these warnings for the time being.
When we upgrade to a new release of googletest, we can remove this again
Author: Wes McKinney <[email protected]>
Closes #1433 from wesm/ARROW-1931 and squashes the following commits:
09c3722f [Wes McKinney] Add tr1 define to CMAKE_CXX_FLAGS
6fe636ec [Wes McKinney] Rearrange appveyor build jobs for faster feedback
6ace398e [Wes McKinney] Use CXX_COMMON_FLAGS, all in one place
b786a405 [Wes McKinney] Silence std::tr1 tuple warning everywhere
549e0833 [Wes McKinney] Silence std::tr1 namespace warning only when
building gtest
13a77e6b [Wes McKinney] Silence tr1 deprecation warning in MSVC 2017
ccf13188 [Wes McKinney] Add /bigobj flag, suppress C4996 deprecation
warning for now
---
appveyor.yml | 18 +++++++++---------
cpp/cmake_modules/SetupCxxFlags.cmake | 11 +++++++++++
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index e647b8b..ea7922b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,16 +20,13 @@ os: Visual Studio 2015
environment:
matrix:
- - JOB: "Cmake_Script_Tests"
- GENERATOR: NMake Makefiles
- PYTHON: "3.5"
- ARCH: "64"
- CONFIGURATION: "Release"
- JOB: "Build"
- GENERATOR: NMake Makefiles
+ GENERATOR: Visual Studio 15 2017 Win64
PYTHON: "3.5"
ARCH: "64"
CONFIGURATION: "Release"
+ APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+ BOOST_ROOT: C:\Libraries\boost_1_64_0
- JOB: "Build_Debug"
GENERATOR: Visual Studio 14 2015 Win64
PYTHON: "3.5"
@@ -49,13 +46,16 @@ environment:
PYTHON: "3.5"
ARCH: "64"
CONFIGURATION: "Release"
+ - JOB: "Cmake_Script_Tests"
+ GENERATOR: NMake Makefiles
+ PYTHON: "3.5"
+ ARCH: "64"
+ CONFIGURATION: "Release"
- JOB: "Build"
- GENERATOR: Visual Studio 15 2017 Win64
+ GENERATOR: NMake Makefiles
PYTHON: "3.5"
ARCH: "64"
CONFIGURATION: "Release"
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
- BOOST_ROOT: C:\Libraries\boost_1_64_0
MSVC_DEFAULT_OPTIONS: ON
BOOST_ROOT: C:\Libraries\boost_1_63_0
diff --git a/cpp/cmake_modules/SetupCxxFlags.cmake
b/cpp/cmake_modules/SetupCxxFlags.cmake
index 4e0ace0..97aed6b 100644
--- a/cpp/cmake_modules/SetupCxxFlags.cmake
+++ b/cpp/cmake_modules/SetupCxxFlags.cmake
@@ -34,6 +34,14 @@ if (MSVC)
# headers will see dllimport
add_definitions(-DARROW_EXPORTING)
+ # ARROW-1931 See https://github.com/google/googletest/issues/1318
+ #
+ # This is added to CMAKE_CXX_FLAGS instead of CXX_COMMON_FLAGS since only the
+ # former is passed into the external projects
+ if (MSVC_VERSION VERSION_GREATER 1900)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
/D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING")
+ endif()
+
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
# clang-cl
set(CXX_COMMON_FLAGS "-EHsc")
@@ -56,6 +64,9 @@ if (MSVC)
string(REPLACE "/MD" "-MT" ${c_flag} "${${c_flag}}")
endforeach()
endif()
+
+ # Support large object code
+ set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} /bigobj")
else()
# Common flags set below with warning level
set(CXX_COMMON_FLAGS "")
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
