From 67d259ddd5fb364e7ecccf93de17ba0d69056d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Mu=CC=88ller?= Date: Tue, 19 Jan 2021 14:35:04 +0000 Subject: [PATCH 1/2] ARROW-10489: [C++] Add Intel C++ compiler options for BUILD_WARNING_LEVEL == CHECKIN. --- cpp/cmake_modules/SetupCxxFlags.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cpp/cmake_modules/SetupCxxFlags.cmake b/cpp/cmake_modules/SetupCxxFlags.cmake index 03d6a4ea34e..ece7bbb9a9f 100644 --- a/cpp/cmake_modules/SetupCxxFlags.cmake +++ b/cpp/cmake_modules/SetupCxxFlags.cmake @@ -267,6 +267,16 @@ if("${BUILD_WARNING_LEVEL}" STREQUAL "CHECKIN") set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-deprecated-declarations") set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-sign-conversion") set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-unused-variable") + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") + if(WIN32) + set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} /Wall") + set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} /Wno-deprecated") + set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} /Wno-unused-variable") + else() + set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wall") + set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-deprecated") + set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-unused-variable") + endif() else() message(FATAL_ERROR "${UNKNOWN_COMPILER_MESSAGE}") endif() From b253efe80acf5a14cac7a1b169426545094f3de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Mu=CC=88ller?= Date: Tue, 19 Jan 2021 14:57:59 +0000 Subject: [PATCH 2/2] ARROW-10489: [C++] Add Intel C++ compiler options for BUILD_WARNING_LEVEL == EVERYTHING and Production. In both cases, we simply use -Wall. --- cpp/cmake_modules/SetupCxxFlags.cmake | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/cpp/cmake_modules/SetupCxxFlags.cmake b/cpp/cmake_modules/SetupCxxFlags.cmake index ece7bbb9a9f..71443332d29 100644 --- a/cpp/cmake_modules/SetupCxxFlags.cmake +++ b/cpp/cmake_modules/SetupCxxFlags.cmake @@ -299,6 +299,12 @@ elseif("${BUILD_WARNING_LEVEL}" STREQUAL "EVERYTHING") set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wpedantic") set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wextra") set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-unused-parameter") + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") + if(WIN32) + set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} /Wall") + else() + set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wall") + endif() else() message(FATAL_ERROR "${UNKNOWN_COMPILER_MESSAGE}") endif() @@ -314,9 +320,14 @@ else() set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} /W3") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" - OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU" - OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel") + OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wall") + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") + if(WIN32) + set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} /Wall") + else() + set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wall") + endif() else() message(FATAL_ERROR "${UNKNOWN_COMPILER_MESSAGE}") endif()