Skip to content

Commit

Permalink
ran cmake format
Browse files Browse the repository at this point in the history
  • Loading branch information
EpsilonPrime committed Oct 19, 2023
1 parent d7ae73f commit 013e583
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 14 deletions.
10 changes: 4 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,11 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED True)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

option(
SUBSTRAIT_CPP_SANITIZE_DEBUG_BUILD
"Turns on address and undefined memory sanitization runtime checking."
ON
)
option(SUBSTRAIT_CPP_SANITIZE_DEBUG_BUILD
"Turns on address and undefined memory sanitization runtime checking."
ON)

if (${SUBSTRAIT_CPP_SANITIZE_DEBUG_BUILD})
if(${SUBSTRAIT_CPP_SANITIZE_DEBUG_BUILD})
add_compile_options($<$<CONFIG:Debug>:-fsanitize=undefined>)
add_link_options($<$<CONFIG:Debug>:-fsanitize=undefined>)

Expand Down
11 changes: 4 additions & 7 deletions src/substrait/proto/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ set(UPDATE_PROTO_PACKAGE_TOOL
"${CMAKE_CURRENT_SOURCE_DIR}/update_proto_package.pl")

set(RAW_PROTO_INCLUDE_DIR
"${CMAKE_CURRENT_SOURCE_DIR}/../../../third_party/substrait/proto/substrait")
"${CMAKE_CURRENT_SOURCE_DIR}/../../../third_party/substrait/proto/substrait"
)
cmake_path(SET PROTO_INCLUDE_DIR NORMALIZE "${RAW_PROTO_INCLUDE_DIR}")
cmake_path(GET PROTO_INCLUDE_DIR PARENT_PATH PROTO_INCLUDE_TOPLEVEL_DIR)
set(PROTOBUF_IMPORT_DIRS ${PROTO_INCLUDE_DIR}/extensions)
Expand All @@ -24,9 +25,7 @@ set(GENERATED_PROTO_MIDLEVEL_DIR
"${GENERATED_PROTO_TOPLEVEL_DIR}/substrait/proto")
set(GENERATED_PROTOBUF_LIST)
foreach(PROTO_FILE IN LISTS PROTOBUF_FILELIST)
file(RELATIVE_PATH RELATIVE_PROTO_PATH
"${PROTO_INCLUDE_DIR}"
"${PROTO_FILE}")
file(RELATIVE_PATH RELATIVE_PROTO_PATH "${PROTO_INCLUDE_DIR}" "${PROTO_FILE}")
set(GENERATED_PROTO_FILE
${GENERATED_PROTO_MIDLEVEL_DIR}/${RELATIVE_PROTO_PATH})

Expand Down Expand Up @@ -54,9 +53,7 @@ cmake_path(GET PROTO_OUTPUT_PARENT_DIR PARENT_PATH PROTO_OUTPUT_MIDLEVEL_DIR)
cmake_path(GET PROTO_OUTPUT_MIDLEVEL_DIR PARENT_PATH PROTO_OUTPUT_TOPLEVEL_DIR)

foreach(PROTO_FILE IN LISTS PROTOBUF_FILELIST)
file(RELATIVE_PATH RELATIVE_PROTO_PATH
"${PROTO_INCLUDE_DIR}"
"${PROTO_FILE}")
file(RELATIVE_PATH RELATIVE_PROTO_PATH "${PROTO_INCLUDE_DIR}" "${PROTO_FILE}")
set(GENERATED_PROTO_FILE
${GENERATED_PROTO_MIDLEVEL_DIR}/${RELATIVE_PROTO_PATH})
message(
Expand Down
3 changes: 2 additions & 1 deletion src/substrait/textplan/parser/grammar/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: Apache-2.0

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../third_party/antlr4/cmake")
list(APPEND CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/../../../../../third_party/antlr4/cmake")

set(CMAKE_CXX_STANDARD 17)

Expand Down

0 comments on commit 013e583

Please sign in to comment.