Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[VL] Update vcpkg glog cmake option to remove glog change from modify_velox.patch #6800

Closed
wants to merge 1 commit into from
Closed

[VL] Update vcpkg glog cmake option to remove glog change from modify_velox.patch #6800

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 0 additions & 39 deletions ep/build-velox/src/modify_velox.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,30 +102,6 @@ index cc180b86c..7ca6fa727 100644
if(NOT TARGET gflags::gflags)
# This is a bit convoluted, but we want to be able to use gflags::gflags as a
# target even when velox is built as a subproject which uses
diff --git a/velox/common/process/tests/CMakeLists.txt b/velox/common/process/tests/CMakeLists.txt
index 23ef279c2..7e4c2f2b2 100644
--- a/velox/common/process/tests/CMakeLists.txt
+++ b/velox/common/process/tests/CMakeLists.txt
@@ -24,4 +24,6 @@ target_link_libraries(
fmt::fmt
velox_time
GTest::gtest
- GTest::gtest_main)
+ GTest::gtest_main
+ glog::glog
+ gflags::gflags)
diff --git a/velox/connectors/hive/storage_adapters/abfs/RegisterAbfsFileSystem.cpp b/velox/connectors/hive/storage_adapters/abfs/RegisterAbfsFileSystem.cpp
index 5a566770f..8c2a48cc2 100644
--- a/velox/connectors/hive/storage_adapters/abfs/RegisterAbfsFileSystem.cpp
+++ b/velox/connectors/hive/storage_adapters/abfs/RegisterAbfsFileSystem.cpp
@@ -38,7 +38,6 @@ std::shared_ptr<FileSystem> abfsFileSystemGenerator(

void registerAbfsFileSystem() {
#ifdef VELOX_ENABLE_ABFS
- LOG(INFO) << "Register ABFS";
registerFileSystem(isAbfsFile, std::function(abfsFileSystemGenerator));
#endif
}
diff --git a/velox/connectors/hive/storage_adapters/hdfs/tests/HdfsMiniCluster.cpp b/velox/connectors/hive/storage_adapters/hdfs/tests/HdfsMiniCluster.cpp
index 10ee508ba..027a58ecc 100644
--- a/velox/connectors/hive/storage_adapters/hdfs/tests/HdfsMiniCluster.cpp
Expand All @@ -139,18 +115,3 @@ index 10ee508ba..027a58ecc 100644
setupEnvironment(hadoopHomeDirectory.string());
}

diff --git a/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt b/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt
index 0cda25430..b15565796 100644
--- a/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt
+++ b/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt
@@ -38,7 +38,9 @@ target_link_libraries(
GTest::gtest
GTest::gtest_main
arrow
- arrow_testing)
+ arrow_testing
+ glog::glog
+ gflags::gflags)

add_library(
velox_dwio_arrow_parquet_writer_test_lib
Loading