This is an automated email from the ASF dual-hosted git repository.
philo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 9a77a8c33a [VL] Remove VELOX_BUILD_PATH from include directories if
build test is disabled (#7449)
9a77a8c33a is described below
commit 9a77a8c33a9bfd3022f9702a8bd70dd6875f1ad3
Author: PHILO-HE <[email protected]>
AuthorDate: Thu Oct 10 14:51:50 2024 +0800
[VL] Remove VELOX_BUILD_PATH from include directories if build test is
disabled (#7449)
---
cpp/velox/CMakeLists.txt | 9 +++++----
cpp/velox/operators/writer/VeloxParquetDatasource.h | 2 +-
cpp/velox/tests/Substrait2VeloxPlanConversionTest.cc | 1 -
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cpp/velox/CMakeLists.txt b/cpp/velox/CMakeLists.txt
index f872df47bf..62ddecc571 100644
--- a/cpp/velox/CMakeLists.txt
+++ b/cpp/velox/CMakeLists.txt
@@ -231,7 +231,11 @@ endif()
target_include_directories(
velox PUBLIC ${CMAKE_SYSTEM_INCLUDE_PATH} ${JNI_INCLUDE_DIRS}
- ${CMAKE_CURRENT_SOURCE_DIR} ${VELOX_HOME}/ ${VELOX_BUILD_PATH}/)
+ ${CMAKE_CURRENT_SOURCE_DIR} ${PROTOBUF_INCLUDE} ${VELOX_HOME})
+
+if(BUILD_TESTS)
+ target_include_directories(velox PUBLIC ${VELOX_BUILD_PATH})
+endif()
set_target_properties(velox PROPERTIES LIBRARY_OUTPUT_DIRECTORY
${root_directory}/releases)
@@ -241,9 +245,6 @@ set_target_properties(velox PROPERTIES
LIBRARY_OUTPUT_DIRECTORY
# applicable to other dependencies.
find_package(Folly REQUIRED CONFIG)
-target_include_directories(velox PUBLIC ${GTEST_INCLUDE_DIRS}
- ${PROTOBUF_INCLUDE})
-
if(BUILD_JEMALLOC)
include(Findjemalloc_pic)
find_jemalloc()
diff --git a/cpp/velox/operators/writer/VeloxParquetDatasource.h
b/cpp/velox/operators/writer/VeloxParquetDatasource.h
index 6b68396ec4..15541f8a87 100644
--- a/cpp/velox/operators/writer/VeloxParquetDatasource.h
+++ b/cpp/velox/operators/writer/VeloxParquetDatasource.h
@@ -48,7 +48,7 @@
#endif
#include "velox/dwio/common/FileSink.h"
#include "velox/dwio/common/Options.h"
-#include "velox/dwio/dwrf/reader/DwrfReader.h"
+#include "velox/dwio/common/ReaderFactory.h"
#include "velox/dwio/parquet/writer/Writer.h"
#include "velox/vector/ComplexVector.h"
diff --git a/cpp/velox/tests/Substrait2VeloxPlanConversionTest.cc
b/cpp/velox/tests/Substrait2VeloxPlanConversionTest.cc
index 3926b22c9c..06d4ea0195 100644
--- a/cpp/velox/tests/Substrait2VeloxPlanConversionTest.cc
+++ b/cpp/velox/tests/Substrait2VeloxPlanConversionTest.cc
@@ -22,7 +22,6 @@
#include "substrait/SubstraitToVeloxPlan.h"
#include "velox/common/base/tests/GTestUtils.h"
#include "velox/dwio/common/tests/utils/DataFiles.h"
-#include "velox/dwio/dwrf/reader/DwrfReader.h"
#include "velox/exec/tests/utils/AssertQueryBuilder.h"
#include "velox/exec/tests/utils/HiveConnectorTestBase.h"
#include "velox/exec/tests/utils/TempDirectoryPath.h"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
