Skip to content

MINOR: [C++] Always call cmake message() with explicit mode #13237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kou merged 1 commit into from
May 26, 2022
Merged

MINOR: [C++] Always call cmake message() with explicit mode #13237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions cpp/cmake_modules/SetupCxxFlags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,8 +548,8 @@ if(NOT WIN32 AND NOT APPLE)
OUTPUT_VARIABLE GOLD_LOCATION
OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
if("${GOLD_LOCATION}" MATCHES "^/opt/rh/devtoolset")
message("Skipping optional gold linker (version ${GOLD_VERSION}) because "
"it's in devtoolset")
message(STATUS "Skipping optional gold linker (version ${GOLD_VERSION}) because "
"it's in devtoolset")
set(GOLD_VERSION)
endif()
endif()
Expand All @@ -571,7 +571,7 @@ if(NOT WIN32 AND NOT APPLE)
set(ARROW_BUGGY_GOLD 1)
endif()
if(MUST_USE_GOLD)
message("Using hard-wired gold linker (version ${GOLD_VERSION})")
message(STATUS "Using hard-wired gold linker (version ${GOLD_VERSION})")
if(ARROW_BUGGY_GOLD)
if("${ARROW_LINK}" STREQUAL "d" AND "${CMAKE_BUILD_TYPE}" STREQUAL "RELEASE")
message(SEND_ERROR "Configured to use buggy gold with dynamic linking "
Expand All @@ -582,12 +582,12 @@ if(NOT WIN32 AND NOT APPLE)
# The Gold linker must be manually enabled.
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=gold")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
message("Using optional gold linker (version ${GOLD_VERSION})")
message(STATUS "Using optional gold linker (version ${GOLD_VERSION})")
else()
message("Optional gold linker is buggy, using ld linker instead")
message(STATUS "Optional gold linker is buggy, using ld linker instead")
endif()
else()
message("Using ld linker")
message(STATUS "Using ld linker")
endif()
endif()

Expand Down Expand Up @@ -625,7 +625,7 @@ set(CXX_FLAGS_PROFILE_GEN "${CXX_FLAGS_RELEASE} -fprofile-generate")
set(CXX_FLAGS_PROFILE_BUILD "${CXX_FLAGS_RELEASE} -fprofile-use")

# Set compile flags based on the build type.
message("Configured for ${CMAKE_BUILD_TYPE} build (set with cmake -DCMAKE_BUILD_TYPE={release,debug,...})"
message(STATUS "Configured for ${CMAKE_BUILD_TYPE} build (set with cmake -DCMAKE_BUILD_TYPE={release,debug,...})"
)
if("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_FLAGS_DEBUG}")
Expand Down
10 changes: 5 additions & 5 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,7 +1423,7 @@ macro(build_thrift)
message(FATAL_ERROR "Building thrift using ExternalProject requires at least CMake 3.10"
)
endif()
message("Building Apache Thrift from source")
message(STATUS "Building Apache Thrift from source")
set(THRIFT_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/thrift_ep-install")
set(THRIFT_INCLUDE_DIR "${THRIFT_PREFIX}/include")
set(THRIFT_CMAKE_ARGS
Expand Down Expand Up @@ -1526,7 +1526,7 @@ endif()
# Protocol Buffers (required for ORC, Flight, Gandiva and Substrait libraries)

macro(build_protobuf)
message("Building Protocol Buffers from source")
message(STATUS "Building Protocol Buffers from source")
set(PROTOBUF_VENDORED TRUE)
set(PROTOBUF_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/protobuf_ep-install")
set(PROTOBUF_INCLUDE_DIR "${PROTOBUF_PREFIX}/include")
Expand Down Expand Up @@ -1710,7 +1710,7 @@ endif()
# Substrait (required by compute engine)

macro(build_substrait)
message("Building Substrait from source")
message(STATUS "Building Substrait from source")

set(SUBSTRAIT_PROTOS
capabilities
Expand Down Expand Up @@ -4019,7 +4019,7 @@ endif()
# Apache ORC

macro(build_orc)
message("Building Apache ORC from source")
message(STATUS "Building Apache ORC from source")

set(ORC_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/orc_ep-install")
set(ORC_HOME "${ORC_PREFIX}")
Expand Down Expand Up @@ -4321,7 +4321,7 @@ endif()
# AWS SDK for C++

macro(build_awssdk)
message("Building AWS C++ SDK from source")
message(STATUS "Building AWS C++ SDK from source")
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS
"4.9")
message(FATAL_ERROR "AWS C++ SDK requires gcc >= 4.9")
Expand Down
2 changes: 1 addition & 1 deletion cpp/cmake_modules/san-config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ if(${ARROW_USE_TSAN})
# guarantee that is via dynamic linking (not all 3rd party archives are
# compiled with -fPIC e.g. boost).
if("${ARROW_LINK}" STREQUAL "a")
message("Using dynamic linking for TSAN")
message(STATUS "Using dynamic linking for TSAN")
set(ARROW_LINK "d")
elseif("${ARROW_LINK}" STREQUAL "s")
message(SEND_ERROR "Cannot use TSAN with static linking")
Expand Down