Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ include(cmake/clang-tidy.cmake)
unset(CMAKE_CXX_CLANG_TIDY)

add_subdirectory(third_party)
set(CMAKE_CXX_CLANG_TIDY ${CLANG_TIDY_COMMAND}) # Re-enable clang-tidy.

# Re-enable clang-tidy.
set(CMAKE_CXX_CLANG_TIDY ${SUBSTRAIT_CPP_CLANG_TIDY_COMMAND})

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
include(BuildUtils)
Expand Down
7 changes: 4 additions & 3 deletions cmake/clang-tidy.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ if(SUBSTRAIT_CPP_ENABLE_CLANG_TIDY)

# Assemble command line.
set(CLANG_TIDY_CONFIG_FILE "${CMAKE_SOURCE_DIR}/.clang-tidy")
set(CLANG_TIDY_COMMAND
set(SUBSTRAIT_CPP_CLANG_TIDY_COMMAND
"${CLANG_TIDY_EXE};--config-file=${CLANG_TIDY_CONFIG_FILE}")
set(CMAKE_CXX_CLANG_TIDY_EXPORT_FIXES_DIR
"${CMAKE_BINARY_DIR}/clang-tidy-fixes")
message(STATUS "clang-tidy enabled, command: ${CLANG_TIDY_COMMAND}")
message(
STATUS "clang-tidy enabled, command: ${SUBSTRAIT_CPP_CLANG_TIDY_COMMAND}")
endif(SUBSTRAIT_CPP_ENABLE_CLANG_TIDY)

# Enable clang-tidy for all C++ targets.
set(CMAKE_CXX_CLANG_TIDY ${CLANG_TIDY_COMMAND})
set(CMAKE_CXX_CLANG_TIDY ${SUBSTRAIT_CPP_CLANG_TIDY_COMMAND})
6 changes: 4 additions & 2 deletions src/substrait/proto/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,12 @@ foreach(PROTO_FILE IN LISTS PROTOBUF_FILELIST)
list(APPEND PROTO_SRCS ${PROTO_SRC})
endforeach()

# Add the generated protobuf C++ files to our exported library.
# Add the generated protobuf C++ files to our exported library. Disable
# clang-tidy because the generated code doesn't pass.
unset(CMAKE_CXX_CLANG_TIDY)
add_library(substrait_proto ${PROTO_SRCS} ${PROTO_HDRS} ProtoUtils.cpp)
set(CMAKE_CXX_CLANG_TIDY ${CLANG_TIDY_COMMAND}) # Re-enable clang-tidy.
set(CMAKE_CXX_CLANG_TIDY ${SUBSTRAIT_CPP_CLANG_TIDY_COMMAND})

target_sources(
substrait_proto
PUBLIC FILE_SET
Expand Down
Loading