Skip to content

Commit 0cf9e03

Browse files
authored
GH-50300: [C++][CI] Update include to generated/Message_generated.h so Meson is able to find (#50301)
### Rationale for this change The meson job is currently failing due to not finding header for include on flatbuffers generated file. This works on CMake because we have: `include_directories(src/generated)` and didn't failed previously on Meson because we use the full `generated/xxx.h` path to the files on includes. ### What changes are included in this PR? Add `generated` in the include so meson can also find the header without requiring to include directory. Remove `include_directories(src/generated)` on CMake to match Meson configuration. ### Are these changes tested? Yes, via CI ### Are there any user-facing changes? No * GitHub Issue: #50300 Authored-by: Raúl Cumplido <raulcumplido@gmail.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
1 parent 52d6940 commit 0cf9e03

2 files changed

Lines changed: 1 addition & 4 deletions

File tree

cpp/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -551,9 +551,6 @@ message(STATUS "CMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}: ${CMAKE_CXX_FLAGS_${UPP
551551
include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
552552
include_directories(src)
553553

554-
# Compiled flatbuffers files
555-
include_directories(src/generated)
556-
557554
#
558555
# Visibility
559556
#

cpp/src/arrow/ipc/message_internal_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include <gtest/gtest.h>
2626

27-
#include "Message_generated.h"
27+
#include "generated/Message_generated.h"
2828

2929
#include "arrow/buffer.h"
3030
#include "arrow/io/memory.h"

0 commit comments

Comments
 (0)