[VL] Remove VELOX_BUILD_PATH from include directories if build test i…

…s disabled (apache#7449)
mskapilks · Oct 10, 2024 · 9a77a8c · 9a77a8c
1 parent fa0f484
commit 9a77a8c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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"