diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ee2d15829c45..bb02a13dca87 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -61,10 +61,8 @@ jobs: env: HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: "TRUE" run: | - brew install \ - bison boost ccache double-conversion flex fmt gflags glog \ - icu4c libevent libsodium lz4 lzo ninja openssl protobuf@21 \ - range-v3 simdjson snappy thrift xz xsimd zstd + source scripts/setup-macos.sh + brew install $MACOS_BUILD_DEPS $MACOS_VELOX_DEPS echo "NJOBS=`sysctl -n hw.ncpu`" >> $GITHUB_ENV brew unlink protobuf || echo "protobuf not installed" diff --git a/CMakeLists.txt b/CMakeLists.txt index 2dc95f972877..cc180b86c697 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -540,8 +540,8 @@ include_directories(SYSTEM velox/external) # these were previously vendored in third-party/ if(NOT VELOX_DISABLE_GOOGLETEST) - set(gtest_SOURCE AUTO) - resolve_dependency(gtest) + set(GTest_SOURCE AUTO) + resolve_dependency(GTest) set(VELOX_GTEST_INCUDE_DIR "${gtest_SOURCE_DIR}/googletest/include" PARENT_SCOPE) diff --git a/scripts/setup-macos.sh b/scripts/setup-macos.sh index f9ae1e6818aa..450324e8b19a 100755 --- a/scripts/setup-macos.sh +++ b/scripts/setup-macos.sh @@ -35,7 +35,7 @@ PYTHON_VENV=${PYHTON_VENV:-"${SCRIPTDIR}/../.venv"} NPROC=$(getconf _NPROCESSORS_ONLN) DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)} -MACOS_VELOX_DEPS="flex bison protobuf@21 icu4c boost gflags glog libevent lz4 lzo snappy xz zstd openssl libsodium" +MACOS_VELOX_DEPS="bison boost double-conversion flex fmt gflags glog googletest icu4c libevent libsodium lz4 lzo openssl protobuf@21 simdjson snappy thrift xz xsimd zstd" MACOS_BUILD_DEPS="ninja cmake ccache" FB_OS_VERSION="v2024.05.20.00" FMT_VERSION="10.1.1" diff --git a/velox/benchmarks/CMakeLists.txt b/velox/benchmarks/CMakeLists.txt index 8ad8465ea4d2..b904043b80a5 100644 --- a/velox/benchmarks/CMakeLists.txt +++ b/velox/benchmarks/CMakeLists.txt @@ -33,7 +33,7 @@ target_link_libraries( velox_benchmark_builder ${velox_benchmark_deps}) # This is a workaround for the use of VectorTestBase.h which includes gtest.h target_link_libraries( - velox_benchmark_builder gtest) + velox_benchmark_builder GTest::gtest) if(${VELOX_ENABLE_BENCHMARKS}) add_subdirectory(tpch) diff --git a/velox/buffer/tests/CMakeLists.txt b/velox/buffer/tests/CMakeLists.txt index a6029241f9a1..097f5ee3bb3f 100644 --- a/velox/buffer/tests/CMakeLists.txt +++ b/velox/buffer/tests/CMakeLists.txt @@ -20,9 +20,9 @@ target_link_libraries( velox_memory velox_buffer velox_test_util - gtest - gtest_main - gmock + GTest::gtest + GTest::gtest_main + GTest::gmock glog::glog gflags::gflags pthread) diff --git a/velox/common/base/tests/CMakeLists.txt b/velox/common/base/tests/CMakeLists.txt index d7e5030b166d..51fa95a14f95 100644 --- a/velox/common/base/tests/CMakeLists.txt +++ b/velox/common/base/tests/CMakeLists.txt @@ -51,9 +51,9 @@ target_link_libraries( Folly::folly fmt::fmt gflags::gflags - gtest - gmock - gtest_main) + GTest::gtest + GTest::gmock + GTest::gtest_main) add_executable(velox_id_map_test IdMapTest.cpp) @@ -67,8 +67,8 @@ target_link_libraries( Boost::headers gflags::gflags glog::glog - gtest - gtest_main + GTest::gtest + GTest::gtest_main pthread) add_executable(velox_memcpy_meter Memcpy.cpp) diff --git a/velox/common/caching/tests/CMakeLists.txt b/velox/common/caching/tests/CMakeLists.txt index 319bca4b5606..cc7fafe2a752 100644 --- a/velox/common/caching/tests/CMakeLists.txt +++ b/velox/common/caching/tests/CMakeLists.txt @@ -20,8 +20,8 @@ target_link_libraries( Folly::folly velox_time glog::glog - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) add_executable( velox_cache_test @@ -40,8 +40,8 @@ target_link_libraries( velox_temp_path Folly::folly glog::glog - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) add_executable(cached_factory_test CachedFactoryTest.cpp) add_test(cached_factory_test cached_factory_test) @@ -52,5 +52,5 @@ target_link_libraries( Folly::folly velox_time glog::glog - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/common/compression/tests/CMakeLists.txt b/velox/common/compression/tests/CMakeLists.txt index d7200934b9fd..3b75b6fea698 100644 --- a/velox/common/compression/tests/CMakeLists.txt +++ b/velox/common/compression/tests/CMakeLists.txt @@ -17,4 +17,5 @@ add_test(velox_common_compression_test velox_common_compression_test) target_link_libraries( velox_common_compression_test PUBLIC velox_link_libs - PRIVATE velox_common_compression velox_exception gtest gtest_main) + PRIVATE velox_common_compression velox_exception GTest::gtest + GTest::gtest_main) diff --git a/velox/common/encode/tests/CMakeLists.txt b/velox/common/encode/tests/CMakeLists.txt index e3268cb7f1b9..90c9733ecf22 100644 --- a/velox/common/encode/tests/CMakeLists.txt +++ b/velox/common/encode/tests/CMakeLists.txt @@ -17,4 +17,4 @@ add_test(velox_common_encode_test velox_common_encode_test) target_link_libraries( velox_common_encode_test PUBLIC Folly::folly - PRIVATE velox_encode velox_exception gtest gtest_main) + PRIVATE velox_encode velox_exception GTest::gtest GTest::gtest_main) diff --git a/velox/common/file/tests/CMakeLists.txt b/velox/common/file/tests/CMakeLists.txt index 3e8db79a8e34..20245002e0a1 100644 --- a/velox/common/file/tests/CMakeLists.txt +++ b/velox/common/file/tests/CMakeLists.txt @@ -27,6 +27,6 @@ target_link_libraries( velox_file velox_file_test_utils velox_temp_path - gmock - gtest - gtest_main) + GTest::gmock + GTest::gtest + GTest::gtest_main) diff --git a/velox/common/hyperloglog/tests/CMakeLists.txt b/velox/common/hyperloglog/tests/CMakeLists.txt index c17e13d8171f..c05a810796fe 100644 --- a/velox/common/hyperloglog/tests/CMakeLists.txt +++ b/velox/common/hyperloglog/tests/CMakeLists.txt @@ -19,4 +19,4 @@ add_test(NAME velox_common_hyperloglog_test target_link_libraries( velox_common_hyperloglog_test - PRIVATE velox_common_hyperloglog velox_encode gtest gtest_main) + PRIVATE velox_common_hyperloglog velox_encode GTest::gtest GTest::gtest_main) diff --git a/velox/common/memory/tests/CMakeLists.txt b/velox/common/memory/tests/CMakeLists.txt index e22bcafeae4e..8fd55b025f49 100644 --- a/velox/common/memory/tests/CMakeLists.txt +++ b/velox/common/memory/tests/CMakeLists.txt @@ -45,9 +45,9 @@ target_link_libraries( fmt::fmt gflags::gflags glog::glog - gmock - gtest - gtest_main + GTest::gmock + GTest::gtest + GTest::gtest_main re2::re2) gtest_add_tests(velox_memory_test "" AUTO) diff --git a/velox/common/process/tests/CMakeLists.txt b/velox/common/process/tests/CMakeLists.txt index f5e6aae72cb2..23ef279c21af 100644 --- a/velox/common/process/tests/CMakeLists.txt +++ b/velox/common/process/tests/CMakeLists.txt @@ -22,6 +22,6 @@ target_link_libraries( PRIVATE velox_process fmt::fmt - gtest velox_time - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/common/serialization/tests/CMakeLists.txt b/velox/common/serialization/tests/CMakeLists.txt index 1a84ac64b578..74b2baf630ea 100644 --- a/velox/common/serialization/tests/CMakeLists.txt +++ b/velox/common/serialization/tests/CMakeLists.txt @@ -22,5 +22,5 @@ target_link_libraries( velox_serialization Folly::folly glog::glog - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/common/testutil/tests/CMakeLists.txt b/velox/common/testutil/tests/CMakeLists.txt index 3f516f96cbf1..d164600656a3 100644 --- a/velox/common/testutil/tests/CMakeLists.txt +++ b/velox/common/testutil/tests/CMakeLists.txt @@ -22,5 +22,5 @@ target_link_libraries( velox_exception velox_exec velox_time - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/common/time/tests/CMakeLists.txt b/velox/common/time/tests/CMakeLists.txt index db1a315ecf0d..2b2bc5caa9dc 100644 --- a/velox/common/time/tests/CMakeLists.txt +++ b/velox/common/time/tests/CMakeLists.txt @@ -17,6 +17,6 @@ add_executable(velox_time_test CpuWallTimerTest.cpp) target_link_libraries( velox_time_test - PRIVATE velox_time glog::glog gtest gtest_main) + PRIVATE velox_time glog::glog GTest::gtest GTest::gtest_main) gtest_add_tests(velox_time_test "" AUTO) diff --git a/velox/connectors/fuzzer/tests/CMakeLists.txt b/velox/connectors/fuzzer/tests/CMakeLists.txt index 18e5c913fc16..803619339097 100644 --- a/velox/connectors/fuzzer/tests/CMakeLists.txt +++ b/velox/connectors/fuzzer/tests/CMakeLists.txt @@ -21,5 +21,5 @@ target_link_libraries( velox_vector_test_lib velox_exec_test_lib velox_aggregates - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/connectors/hive/iceberg/tests/CMakeLists.txt b/velox/connectors/hive/iceberg/tests/CMakeLists.txt index 0b0777233ccb..5808b640af64 100644 --- a/velox/connectors/hive/iceberg/tests/CMakeLists.txt +++ b/velox/connectors/hive/iceberg/tests/CMakeLists.txt @@ -55,7 +55,7 @@ if(NOT VELOX_DISABLE_GOOGLETEST) velox_exec_test_lib Folly::folly ${FOLLY_BENCHMARK} - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) endif() diff --git a/velox/connectors/hive/storage_adapters/abfs/tests/CMakeLists.txt b/velox/connectors/hive/storage_adapters/abfs/tests/CMakeLists.txt index 800eb4b544e0..0bb2d428ca1c 100644 --- a/velox/connectors/hive/storage_adapters/abfs/tests/CMakeLists.txt +++ b/velox/connectors/hive/storage_adapters/abfs/tests/CMakeLists.txt @@ -25,8 +25,8 @@ target_link_libraries( velox_hive_connector velox_dwio_common_exception velox_exec - gtest - gtest_main + GTest::gtest + GTest::gtest_main Azure::azure-storage-blobs Azure::azure-storage-files-datalake) diff --git a/velox/connectors/hive/storage_adapters/gcs/tests/CMakeLists.txt b/velox/connectors/hive/storage_adapters/gcs/tests/CMakeLists.txt index b44aa355c09f..edf4c69eeffd 100644 --- a/velox/connectors/hive/storage_adapters/gcs/tests/CMakeLists.txt +++ b/velox/connectors/hive/storage_adapters/gcs/tests/CMakeLists.txt @@ -22,6 +22,6 @@ target_link_libraries( velox_hive_connector velox_dwio_common_exception velox_exec - gmock - gtest - gtest_main) + GTest::gmock + GTest::gtest + GTest::gtest_main) diff --git a/velox/connectors/hive/storage_adapters/hdfs/tests/CMakeLists.txt b/velox/connectors/hive/storage_adapters/hdfs/tests/CMakeLists.txt index 14c23caf52a5..6c3067e2de48 100644 --- a/velox/connectors/hive/storage_adapters/hdfs/tests/CMakeLists.txt +++ b/velox/connectors/hive/storage_adapters/hdfs/tests/CMakeLists.txt @@ -26,9 +26,9 @@ target_link_libraries( velox_hive_connector velox_dwio_common_exception velox_exec - gtest - gtest_main - gmock) + GTest::gtest + GTest::gtest_main + GTest::gmock) target_compile_options(velox_hdfs_file_test PRIVATE -Wno-deprecated-declarations) diff --git a/velox/connectors/hive/storage_adapters/s3fs/tests/CMakeLists.txt b/velox/connectors/hive/storage_adapters/s3fs/tests/CMakeLists.txt index bf7da280a587..852038c483b2 100644 --- a/velox/connectors/hive/storage_adapters/s3fs/tests/CMakeLists.txt +++ b/velox/connectors/hive/storage_adapters/s3fs/tests/CMakeLists.txt @@ -23,8 +23,8 @@ target_link_libraries( velox_exec_test_lib velox_dwio_common_exception velox_exec - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) add_executable(velox_s3registration_test S3FileSystemRegistrationTest.cpp) add_test(velox_s3registration_test velox_s3registration_test) @@ -37,8 +37,8 @@ target_link_libraries( velox_exec_test_lib velox_dwio_common_exception velox_exec - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) add_executable(velox_s3finalize_test S3FileSystemFinalizeTest.cpp) add_test(velox_s3finalize_test velox_s3finalize_test) @@ -48,8 +48,8 @@ target_link_libraries( velox_hive_config velox_file velox_core - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) add_executable(velox_s3insert_test S3InsertTest.cpp) add_test(velox_s3insert_test velox_s3insert_test) @@ -62,8 +62,8 @@ target_link_libraries( velox_exec_test_lib velox_dwio_common_exception velox_exec - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) add_executable(velox_s3read_test S3ReadTest.cpp) add_test( @@ -79,8 +79,8 @@ target_link_libraries( velox_exec_test_lib velox_dwio_common_exception velox_exec - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) add_executable(velox_s3multiendpoints_test S3MultipleEndpointsTest.cpp) add_test(velox_s3multiendpoints_test velox_s3multiendpoints_test) @@ -93,5 +93,5 @@ target_link_libraries( velox_exec_test_lib velox_dwio_common_exception velox_exec - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/connectors/hive/tests/CMakeLists.txt b/velox/connectors/hive/tests/CMakeLists.txt index 7a9632f7d06d..ee862b1391d7 100644 --- a/velox/connectors/hive/tests/CMakeLists.txt +++ b/velox/connectors/hive/tests/CMakeLists.txt @@ -34,5 +34,5 @@ target_link_libraries( velox_vector_test_lib velox_exec velox_exec_test_lib - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/connectors/tests/CMakeLists.txt b/velox/connectors/tests/CMakeLists.txt index c024da41b3e0..4475ce474ee8 100644 --- a/velox/connectors/tests/CMakeLists.txt +++ b/velox/connectors/tests/CMakeLists.txt @@ -17,8 +17,8 @@ add_test(velox_connector_test velox_connector_test) target_link_libraries( velox_connector_test velox_connector - gtest - gtest_main + GTest::gtest + GTest::gtest_main glog::glog gflags::gflags Folly::folly) diff --git a/velox/connectors/tpch/tests/CMakeLists.txt b/velox/connectors/tpch/tests/CMakeLists.txt index a3b204d6d4ee..5474de3cfa90 100644 --- a/velox/connectors/tpch/tests/CMakeLists.txt +++ b/velox/connectors/tpch/tests/CMakeLists.txt @@ -21,8 +21,8 @@ target_link_libraries( velox_vector_test_lib velox_exec_test_lib velox_aggregates - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) add_executable(velox_tpch_speed_test SpeedTest.cpp) diff --git a/velox/core/tests/CMakeLists.txt b/velox/core/tests/CMakeLists.txt index f1d200cfdb9e..6092bb4b98f6 100644 --- a/velox/core/tests/CMakeLists.txt +++ b/velox/core/tests/CMakeLists.txt @@ -33,5 +33,5 @@ target_link_libraries( velox_presto_types velox_type velox_vector_test_lib - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/duckdb/conversion/tests/CMakeLists.txt b/velox/duckdb/conversion/tests/CMakeLists.txt index 0f3aa61a3060..3a4607dd8a89 100644 --- a/velox/duckdb/conversion/tests/CMakeLists.txt +++ b/velox/duckdb/conversion/tests/CMakeLists.txt @@ -24,6 +24,6 @@ target_link_libraries( velox_functions_prestosql velox_functions_lib velox_functions_test_lib - gtest - gtest_main + GTest::gtest + GTest::gtest_main gflags::gflags) diff --git a/velox/dwio/catalog/fbhive/test/CMakeLists.txt b/velox/dwio/catalog/fbhive/test/CMakeLists.txt index 474e1f3d8429..34b279ffdb8c 100644 --- a/velox/dwio/catalog/fbhive/test/CMakeLists.txt +++ b/velox/dwio/catalog/fbhive/test/CMakeLists.txt @@ -18,6 +18,6 @@ target_link_libraries( file_utils_test velox_dwio_catalog_fbhive velox_dwio_common_exception - gtest - gtest_main - gmock) + GTest::gtest + GTest::gtest_main + GTest::gmock) diff --git a/velox/dwio/common/tests/CMakeLists.txt b/velox/dwio/common/tests/CMakeLists.txt index a34fc879965a..f413dcdab12e 100644 --- a/velox/dwio/common/tests/CMakeLists.txt +++ b/velox/dwio/common/tests/CMakeLists.txt @@ -50,9 +50,9 @@ target_link_libraries( Folly::folly ${TEST_LINK_LIBS} gflags::gflags - gtest - gtest_main - gmock + GTest::gtest + GTest::gtest_main + GTest::gmock glog::glog fmt::fmt protobuf::libprotobuf) diff --git a/velox/dwio/common/tests/utils/CMakeLists.txt b/velox/dwio/common/tests/utils/CMakeLists.txt index 1162b1459e6b..7b3a5722165d 100644 --- a/velox/dwio/common/tests/utils/CMakeLists.txt +++ b/velox/dwio/common/tests/utils/CMakeLists.txt @@ -27,7 +27,7 @@ target_link_libraries( fmt::fmt glog::glog gflags::gflags - gtest + GTest::gtest velox_dwio_common velox_dwio_common_exception velox_exception diff --git a/velox/dwio/dwrf/test/CMakeLists.txt b/velox/dwio/dwrf/test/CMakeLists.txt index e9188efc7853..09ee72cd408e 100644 --- a/velox/dwio/dwrf/test/CMakeLists.txt +++ b/velox/dwio/dwrf/test/CMakeLists.txt @@ -20,9 +20,9 @@ set(TEST_LINK_LIBS velox_dwio_dwrf_reader velox_dwio_dwrf_writer gflags::gflags - gtest - gtest_main - gmock + GTest::gtest + GTest::gtest_main + GTest::gmock glog::glog ${FILESYSTEM}) diff --git a/velox/dwio/dwrf/test/utils/CMakeLists.txt b/velox/dwio/dwrf/test/utils/CMakeLists.txt index 70c82b67cb46..8badcedc8db3 100644 --- a/velox/dwio/dwrf/test/utils/CMakeLists.txt +++ b/velox/dwio/dwrf/test/utils/CMakeLists.txt @@ -25,8 +25,8 @@ target_link_libraries( velox_memory velox_type velox_vector - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) # older versions of GCC need it to allow std::filesystem if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9) diff --git a/velox/dwio/dwrf/utils/test/CMakeLists.txt b/velox/dwio/dwrf/utils/test/CMakeLists.txt index 99b99b05d3ed..ee25ebbf9bb1 100644 --- a/velox/dwio/dwrf/utils/test/CMakeLists.txt +++ b/velox/dwio/dwrf/utils/test/CMakeLists.txt @@ -24,6 +24,6 @@ target_link_libraries( velox_dwio_common_exception velox_type_fbhive gflags::gflags - gtest - gtest_main + GTest::gtest + GTest::gtest_main glog::glog) diff --git a/velox/dwio/orc/test/CMakeLists.txt b/velox/dwio/orc/test/CMakeLists.txt index 271a936fa8af..efb2ad3f5a6f 100644 --- a/velox/dwio/orc/test/CMakeLists.txt +++ b/velox/dwio/orc/test/CMakeLists.txt @@ -22,9 +22,9 @@ target_link_libraries( velox_dwio_orc_reader_test velox_dwrf_test_utils velox_dwio_common_test_utils - gtest - gtest_main - gmock) + GTest::gtest + GTest::gtest_main + GTest::gmock) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/examples DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/velox/dwio/parquet/tests/CMakeLists.txt b/velox/dwio/parquet/tests/CMakeLists.txt index 427a9085d828..6cac19e7e196 100644 --- a/velox/dwio/parquet/tests/CMakeLists.txt +++ b/velox/dwio/parquet/tests/CMakeLists.txt @@ -17,9 +17,9 @@ set(TEST_LINK_LIBS velox_vector_test_lib velox_exec_test_lib velox_temp_path - gtest - gtest_main - gmock + GTest::gtest + GTest::gtest_main + GTest::gmock gflags::gflags ${GLOG} ${FILESYSTEM}) diff --git a/velox/dwio/parquet/tests/thrift/CMakeLists.txt b/velox/dwio/parquet/tests/thrift/CMakeLists.txt index a2656d7190da..3c3af4113645 100644 --- a/velox/dwio/parquet/tests/thrift/CMakeLists.txt +++ b/velox/dwio/parquet/tests/thrift/CMakeLists.txt @@ -20,5 +20,5 @@ target_link_libraries( arrow thrift velox_link_libs - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/dwio/parquet/tests/writer/CMakeLists.txt b/velox/dwio/parquet/tests/writer/CMakeLists.txt index 4de2e43009df..01e718dc22c4 100644 --- a/velox/dwio/parquet/tests/writer/CMakeLists.txt +++ b/velox/dwio/parquet/tests/writer/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_libraries( velox_link_libs Folly::folly ${TEST_LINK_LIBS} - gtest + GTest::gtest fmt::fmt) add_executable(velox_parquet_writer_test ParquetWriterTest.cpp) @@ -46,5 +46,5 @@ target_link_libraries( Boost::regex Folly::folly ${TEST_LINK_LIBS} - gtest + GTest::gtest fmt::fmt) diff --git a/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt b/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt index 97266c25306d..0cda25430f2c 100644 --- a/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt +++ b/velox/dwio/parquet/writer/arrow/tests/CMakeLists.txt @@ -34,9 +34,9 @@ add_test(velox_dwio_arrow_parquet_writer_test target_link_libraries( velox_dwio_arrow_parquet_writer_test velox_dwio_arrow_parquet_writer_test_lib - gmock - gtest - gtest_main + GTest::gmock + GTest::gtest + GTest::gtest_main arrow arrow_testing) @@ -52,4 +52,4 @@ add_library( target_link_libraries( velox_dwio_arrow_parquet_writer_test_lib arrow - velox_dwio_arrow_parquet_writer_lib gtest) + velox_dwio_arrow_parquet_writer_lib GTest::gtest) diff --git a/velox/exec/benchmarks/CMakeLists.txt b/velox/exec/benchmarks/CMakeLists.txt index 8fa3b30b188a..bf4e517f459e 100644 --- a/velox/exec/benchmarks/CMakeLists.txt +++ b/velox/exec/benchmarks/CMakeLists.txt @@ -42,8 +42,8 @@ target_link_libraries( velox_exec velox_vector_test_lib ${FOLLY_BENCHMARK} - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) add_executable(velox_hash_benchmark HashTableBenchmark.cpp) diff --git a/velox/exec/tests/CMakeLists.txt b/velox/exec/tests/CMakeLists.txt index e3fd720c7b50..00230f53464f 100644 --- a/velox/exec/tests/CMakeLists.txt +++ b/velox/exec/tests/CMakeLists.txt @@ -27,8 +27,8 @@ target_link_libraries( aggregate_companion_functions_test velox_exec velox_function_registry - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) add_executable( velox_exec_test @@ -148,9 +148,9 @@ target_link_libraries( Boost::regex Boost::thread Boost::system - gtest - gtest_main - gmock + GTest::gtest + GTest::gtest_main + GTest::gmock Folly::folly gflags::gflags glog::glog @@ -186,9 +186,9 @@ target_link_libraries( Boost::regex Boost::thread Boost::system - gtest - gtest_main - gmock + GTest::gtest + GTest::gtest_main + GTest::gmock Folly::folly gflags::gflags glog::glog @@ -212,21 +212,22 @@ target_link_libraries( add_executable(velox_row_number_fuzzer_test RowNumberFuzzerTest.cpp) target_link_libraries( - velox_row_number_fuzzer_test velox_row_number_fuzzer gtest gtest_main) + velox_row_number_fuzzer_test velox_row_number_fuzzer GTest::gtest + GTest::gtest_main) # Join Fuzzer. add_executable(velox_join_fuzzer_test JoinFuzzerTest.cpp) target_link_libraries( - velox_join_fuzzer_test velox_join_fuzzer gtest gtest_main) + velox_join_fuzzer_test velox_join_fuzzer GTest::gtest GTest::gtest_main) # Arbitration Fuzzer. add_executable(velox_memory_arbitration_fuzzer_test MemoryArbitrationFuzzerTest.cpp) target_link_libraries( - velox_memory_arbitration_fuzzer_test velox_memory_arbitration_fuzzer gtest - gtest_main) + velox_memory_arbitration_fuzzer_test velox_memory_arbitration_fuzzer + GTest::gtest GTest::gtest_main) # Cache Fuzzer add_executable(velox_cache_fuzzer_test CacheFuzzerTest.cpp) @@ -235,8 +236,8 @@ target_link_libraries( velox_cache_fuzzer_test velox_cache_fuzzer velox_fuzzer_util - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) add_executable(velox_exchange_fuzzer_test ExchangeFuzzer.cpp) @@ -246,9 +247,9 @@ target_link_libraries( velox_aggregates velox_vector_test_lib velox_vector_fuzzer - gtest - gtest - gtest_main) + GTest::gtest + GTest::gtest + GTest::gtest_main) add_executable(velox_aggregation_runner_test AggregationRunnerTest.cpp) @@ -258,8 +259,8 @@ target_link_libraries( velox_fuzzer_util velox_aggregates velox_vector_test_lib - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) add_library(velox_simple_aggregate SimpleAverageAggregate.cpp SimpleArrayAggAggregate.cpp) @@ -279,8 +280,8 @@ target_link_libraries( velox_simple_aggregate velox_exec velox_functions_aggregates_test_lib - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) add_library(velox_spiller_join_benchmark_base JoinSpillInputBenchmarkBase.cpp SpillerBenchmarkBase.cpp) @@ -325,4 +326,4 @@ add_test( COMMAND cpr_http_client_test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries( - cpr_http_client_test cpr::cpr gtest gtest_main) + cpr_http_client_test cpr::cpr GTest::gtest GTest::gtest_main) diff --git a/velox/experimental/wave/common/tests/CMakeLists.txt b/velox/experimental/wave/common/tests/CMakeLists.txt index 8914f6a5357c..8cb290f4baec 100644 --- a/velox/experimental/wave/common/tests/CMakeLists.txt +++ b/velox/experimental/wave/common/tests/CMakeLists.txt @@ -30,8 +30,8 @@ target_link_libraries( velox_memory velox_time velox_exception - gtest - gtest_main + GTest::gtest + GTest::gtest_main gflags::gflags glog::glog Folly::folly) diff --git a/velox/experimental/wave/dwio/decode/tests/CMakeLists.txt b/velox/experimental/wave/dwio/decode/tests/CMakeLists.txt index 566d22c4ce7e..6adeeb6268aa 100644 --- a/velox/experimental/wave/dwio/decode/tests/CMakeLists.txt +++ b/velox/experimental/wave/dwio/decode/tests/CMakeLists.txt @@ -23,8 +23,8 @@ target_link_libraries( velox_memory velox_time velox_exception - gtest - gtest_main + GTest::gtest + GTest::gtest_main gflags::gflags glog::glog Folly::folly) diff --git a/velox/experimental/wave/exec/tests/CMakeLists.txt b/velox/experimental/wave/exec/tests/CMakeLists.txt index 008261b7f1d4..d6b0c71be853 100644 --- a/velox/experimental/wave/exec/tests/CMakeLists.txt +++ b/velox/experimental/wave/exec/tests/CMakeLists.txt @@ -50,9 +50,9 @@ target_link_libraries( Boost::regex Boost::thread Boost::system - gtest - gtest_main - gmock + GTest::gtest + GTest::gtest_main + GTest::gmock Folly::folly gflags::gflags glog::glog diff --git a/velox/experimental/wave/vector/tests/CMakeLists.txt b/velox/experimental/wave/vector/tests/CMakeLists.txt index 5423006f52c8..1b12f8ad56ba 100644 --- a/velox/experimental/wave/vector/tests/CMakeLists.txt +++ b/velox/experimental/wave/vector/tests/CMakeLists.txt @@ -29,9 +29,9 @@ target_link_libraries( Boost::regex Boost::thread Boost::system - gtest - gtest_main - gmock + GTest::gtest + GTest::gtest_main + GTest::gmock Folly::folly gflags::gflags glog::glog diff --git a/velox/expression/fuzzer/CMakeLists.txt b/velox/expression/fuzzer/CMakeLists.txt index c7ab1610d713..4e9576db5f23 100644 --- a/velox/expression/fuzzer/CMakeLists.txt +++ b/velox/expression/fuzzer/CMakeLists.txt @@ -16,7 +16,8 @@ add_library(velox_expression_test_utility ArgumentTypeFuzzer.cpp FuzzerToolkit.cpp) target_link_libraries( - velox_expression_test_utility velox_type velox_expression_functions gtest) + velox_expression_test_utility velox_type velox_expression_functions + GTest::gtest) add_library( velox_expression_fuzzer @@ -41,8 +42,8 @@ target_link_libraries( velox_expression_fuzzer_test velox_expression_fuzzer velox_functions_prestosql - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) add_executable(spark_expression_fuzzer_test SparkExpressionFuzzerTest.cpp) @@ -50,8 +51,8 @@ target_link_libraries( spark_expression_fuzzer_test velox_expression_fuzzer velox_functions_spark - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) if(${VELOX_BUILD_TESTING}) add_subdirectory(tests) diff --git a/velox/expression/fuzzer/tests/CMakeLists.txt b/velox/expression/fuzzer/tests/CMakeLists.txt index 233a7a94ae2d..c87b21e173f5 100644 --- a/velox/expression/fuzzer/tests/CMakeLists.txt +++ b/velox/expression/fuzzer/tests/CMakeLists.txt @@ -15,7 +15,7 @@ add_library(velox_expression_fuzzer_test_utility ArgGeneratorTestUtils.cpp) target_link_libraries( velox_expression_fuzzer_test_utility velox_expression_functions - velox_function_registry gtest) + velox_function_registry GTest::gtest) add_executable( velox_expression_fuzzer_unit_test @@ -29,5 +29,5 @@ target_link_libraries( velox_core velox_expression velox_expression_fuzzer_test_utility - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/expression/signature_parser/tests/CMakeLists.txt b/velox/expression/signature_parser/tests/CMakeLists.txt index a809ba6eb710..7d02765ee26b 100644 --- a/velox/expression/signature_parser/tests/CMakeLists.txt +++ b/velox/expression/signature_parser/tests/CMakeLists.txt @@ -20,6 +20,6 @@ target_link_libraries( velox_signature_parser_test velox_signature_parser velox_type_signature - gtest - gtest_main - gmock) + GTest::gtest + GTest::gtest_main + GTest::gmock) diff --git a/velox/expression/tests/CMakeLists.txt b/velox/expression/tests/CMakeLists.txt index d05f8b991839..6692adf6d242 100644 --- a/velox/expression/tests/CMakeLists.txt +++ b/velox/expression/tests/CMakeLists.txt @@ -71,9 +71,9 @@ target_link_libraries( velox_presto_serializer velox_vector_test_lib velox_vector_fuzzer - gtest - gtest_main - gmock + GTest::gtest + GTest::gtest_main + GTest::gmock Folly::folly gflags::gflags glog::glog @@ -95,7 +95,7 @@ target_link_libraries( velox_functions_prestosql velox_functions_spark velox_parse_parser - gtest) + GTest::gtest) add_executable(velox_expression_runner_test ExpressionRunnerTest.cpp) target_link_libraries( @@ -103,8 +103,8 @@ target_link_libraries( velox_expression_runner velox_exec_test_lib velox_function_registry - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) add_executable(velox_expression_verifier_unit_test ExpressionVerifierUnitTest.cpp) @@ -118,8 +118,8 @@ target_link_libraries( velox_parse_utils velox_type velox_vector_test_lib - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) add_executable(velox_expression_runner_unit_test ExpressionRunnerUnitTest.cpp) target_link_libraries( @@ -133,5 +133,5 @@ target_link_libraries( velox_temp_path velox_exec_test_lib velox_vector_test_lib - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/functions/lib/aggregates/tests/CMakeLists.txt b/velox/functions/lib/aggregates/tests/CMakeLists.txt index f3b572f7b847..cd51532cc277 100644 --- a/velox/functions/lib/aggregates/tests/CMakeLists.txt +++ b/velox/functions/lib/aggregates/tests/CMakeLists.txt @@ -24,6 +24,6 @@ target_link_libraries( velox_functions_aggregates velox_functions_test_lib Folly::folly - gtest - gtest_main + GTest::gtest + GTest::gtest_main glog::glog) diff --git a/velox/functions/lib/string/tests/CMakeLists.txt b/velox/functions/lib/string/tests/CMakeLists.txt index 4bf7b67676e2..54b2302de5d2 100644 --- a/velox/functions/lib/string/tests/CMakeLists.txt +++ b/velox/functions/lib/string/tests/CMakeLists.txt @@ -19,7 +19,7 @@ target_link_libraries( velox_functions_string_test velox_functions_string Folly::folly - gtest - gtest_main + GTest::gtest + GTest::gtest_main gflags::gflags glog::glog) diff --git a/velox/functions/lib/tests/CMakeLists.txt b/velox/functions/lib/tests/CMakeLists.txt index 562af955a23b..2ad7404128ef 100644 --- a/velox/functions/lib/tests/CMakeLists.txt +++ b/velox/functions/lib/tests/CMakeLists.txt @@ -39,7 +39,7 @@ target_link_libraries( velox_expression velox_memory velox_dwio_common_test_utils - gtest - gtest_main - gmock + GTest::gtest + GTest::gtest_main + GTest::gmock gflags::gflags) diff --git a/velox/functions/lib/window/tests/CMakeLists.txt b/velox/functions/lib/window/tests/CMakeLists.txt index 692ae4f212e8..309e415e5772 100644 --- a/velox/functions/lib/window/tests/CMakeLists.txt +++ b/velox/functions/lib/window/tests/CMakeLists.txt @@ -20,4 +20,4 @@ target_link_libraries( velox_vector_fuzzer velox_vector_test_lib gflags::gflags - gtest) + GTest::gtest) diff --git a/velox/functions/prestosql/aggregates/tests/CMakeLists.txt b/velox/functions/prestosql/aggregates/tests/CMakeLists.txt index 1ef8c99a8d7a..85265e3613ee 100644 --- a/velox/functions/prestosql/aggregates/tests/CMakeLists.txt +++ b/velox/functions/prestosql/aggregates/tests/CMakeLists.txt @@ -74,5 +74,5 @@ target_link_libraries( velox_vector_fuzzer velox_temp_path gflags::gflags - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/functions/prestosql/fuzzer/CMakeLists.txt b/velox/functions/prestosql/fuzzer/CMakeLists.txt index a0a5777cbf31..7e5053ac6159 100644 --- a/velox/functions/prestosql/fuzzer/CMakeLists.txt +++ b/velox/functions/prestosql/fuzzer/CMakeLists.txt @@ -32,8 +32,8 @@ target_link_libraries( velox_aggregates velox_window velox_vector_test_lib - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) # Window Fuzzer add_executable(velox_window_fuzzer_test WindowFuzzerTest.cpp) @@ -47,8 +47,8 @@ target_link_libraries( velox_expression_test_utility velox_functions_prestosql velox_vector_test_lib - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) # Writer Fuzzer add_executable(velox_writer_fuzzer_test WriterFuzzerTest.cpp) @@ -57,5 +57,5 @@ target_link_libraries( velox_writer_fuzzer_test velox_writer_fuzzer velox_fuzzer_util - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/functions/prestosql/json/tests/CMakeLists.txt b/velox/functions/prestosql/json/tests/CMakeLists.txt index e01499b7c6e4..d1a2ee0fa26e 100644 --- a/velox/functions/prestosql/json/tests/CMakeLists.txt +++ b/velox/functions/prestosql/json/tests/CMakeLists.txt @@ -21,7 +21,7 @@ target_link_libraries( velox_functions_json_test velox_functions_json Folly::folly - gtest - gtest_main + GTest::gtest + GTest::gtest_main gflags::gflags glog::glog) diff --git a/velox/functions/prestosql/tests/CMakeLists.txt b/velox/functions/prestosql/tests/CMakeLists.txt index 8fff437472c5..b1c6feaf31c5 100644 --- a/velox/functions/prestosql/tests/CMakeLists.txt +++ b/velox/functions/prestosql/tests/CMakeLists.txt @@ -120,8 +120,8 @@ target_link_libraries( velox_vector_fuzzer velox_expression_fuzzer_test_utility velox_expression_fuzzer - gtest - gtest_main + GTest::gtest + GTest::gtest_main gflags::gflags - gmock - gmock_main) + GTest::gmock + GTest::gmock_main) diff --git a/velox/functions/prestosql/types/tests/CMakeLists.txt b/velox/functions/prestosql/types/tests/CMakeLists.txt index dc52144e1723..6a7aad65d892 100644 --- a/velox/functions/prestosql/types/tests/CMakeLists.txt +++ b/velox/functions/prestosql/types/tests/CMakeLists.txt @@ -26,8 +26,8 @@ target_link_libraries( velox_presto_types_test velox_presto_types Folly::folly - gtest - gtest_main - gmock + GTest::gtest + GTest::gtest_main + GTest::gmock gflags::gflags glog::glog) diff --git a/velox/functions/prestosql/window/tests/CMakeLists.txt b/velox/functions/prestosql/window/tests/CMakeLists.txt index 64160d48813b..cf9afa365040 100644 --- a/velox/functions/prestosql/window/tests/CMakeLists.txt +++ b/velox/functions/prestosql/window/tests/CMakeLists.txt @@ -21,8 +21,8 @@ set(CMAKE_WINDOW_TEST_LINK_LIBRARIES velox_vector_test_lib velox_window gflags::gflags - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) set(CMAKE_WINDOW_TEST_MAIN_FILES Main.cpp) diff --git a/velox/functions/remote/client/tests/CMakeLists.txt b/velox/functions/remote/client/tests/CMakeLists.txt index 8254e8384fa1..1659ad9d7e5a 100644 --- a/velox/functions/remote/client/tests/CMakeLists.txt +++ b/velox/functions/remote/client/tests/CMakeLists.txt @@ -24,6 +24,6 @@ target_link_libraries( velox_function_registry velox_functions_test_lib velox_exec_test_lib - gmock - gtest - gtest_main) + GTest::gmock + GTest::gtest + GTest::gtest_main) diff --git a/velox/functions/sparksql/aggregates/tests/CMakeLists.txt b/velox/functions/sparksql/aggregates/tests/CMakeLists.txt index 775d9221073c..f8ca9ac613a9 100644 --- a/velox/functions/sparksql/aggregates/tests/CMakeLists.txt +++ b/velox/functions/sparksql/aggregates/tests/CMakeLists.txt @@ -41,5 +41,5 @@ target_link_libraries( velox_hive_connector velox_vector_fuzzer gflags::gflags - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/functions/sparksql/fuzzer/CMakeLists.txt b/velox/functions/sparksql/fuzzer/CMakeLists.txt index 62f8eb1cda8c..e87f5abf1c5d 100644 --- a/velox/functions/sparksql/fuzzer/CMakeLists.txt +++ b/velox/functions/sparksql/fuzzer/CMakeLists.txt @@ -22,5 +22,5 @@ target_link_libraries( velox_fuzzer_util velox_window velox_vector_test_lib - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/functions/sparksql/tests/CMakeLists.txt b/velox/functions/sparksql/tests/CMakeLists.txt index a2bd28af8527..7847cd8d7a4f 100644 --- a/velox/functions/sparksql/tests/CMakeLists.txt +++ b/velox/functions/sparksql/tests/CMakeLists.txt @@ -64,7 +64,7 @@ target_link_libraries( velox_expression_fuzzer_test_utility velox_expression_fuzzer fmt::fmt - gtest - gtest_main - gmock + GTest::gtest + GTest::gtest_main + GTest::gmock gflags::gflags) diff --git a/velox/functions/sparksql/window/tests/CMakeLists.txt b/velox/functions/sparksql/window/tests/CMakeLists.txt index e0166145e819..f0498d83e44c 100644 --- a/velox/functions/sparksql/window/tests/CMakeLists.txt +++ b/velox/functions/sparksql/window/tests/CMakeLists.txt @@ -21,8 +21,8 @@ set(CMAKE_WINDOW_TEST_LINK_LIBRARIES velox_vector_fuzzer velox_vector_test_lib gflags::gflags - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) set(CMAKE_WINDOW_TEST_MAIN_FILES Main.cpp) diff --git a/velox/functions/tests/CMakeLists.txt b/velox/functions/tests/CMakeLists.txt index 322706f6f67a..6b5401bacff8 100644 --- a/velox/functions/tests/CMakeLists.txt +++ b/velox/functions/tests/CMakeLists.txt @@ -19,6 +19,6 @@ target_link_libraries( velox_function_registry_test velox_function_registry velox_functions_test_lib - gmock - gtest - gtest_main) + GTest::gmock + GTest::gtest + GTest::gtest_main) diff --git a/velox/parse/tests/CMakeLists.txt b/velox/parse/tests/CMakeLists.txt index 9b369ca6c15d..e6309be1f251 100644 --- a/velox/parse/tests/CMakeLists.txt +++ b/velox/parse/tests/CMakeLists.txt @@ -19,6 +19,6 @@ add_test(velox_parse_test velox_parse_test) target_link_libraries( velox_parse_test velox_parse_parser - gtest - gtest_main + GTest::gtest + GTest::gtest_main gflags::gflags) diff --git a/velox/row/tests/CMakeLists.txt b/velox/row/tests/CMakeLists.txt index b501fa9fea0f..4d1abfb28c58 100644 --- a/velox/row/tests/CMakeLists.txt +++ b/velox/row/tests/CMakeLists.txt @@ -25,5 +25,5 @@ target_link_libraries( velox_vector_fuzzer velox_vector_test_lib Folly::folly - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/serializers/tests/CMakeLists.txt b/velox/serializers/tests/CMakeLists.txt index e80e61019159..52a0bf715b3e 100644 --- a/velox/serializers/tests/CMakeLists.txt +++ b/velox/serializers/tests/CMakeLists.txt @@ -24,8 +24,8 @@ target_link_libraries( velox_vector_test_lib velox_vector_fuzzer velox_row_fast - gtest - gtest_main + GTest::gtest + GTest::gtest_main gflags::gflags glog::glog) @@ -36,7 +36,7 @@ target_link_libraries( velox_presto_serializer velox_vector_test_lib velox_vector_fuzzer - gtest - gtest_main + GTest::gtest + GTest::gtest_main gflags::gflags glog::glog) diff --git a/velox/substrait/tests/CMakeLists.txt b/velox/substrait/tests/CMakeLists.txt index f4ce48b82dff..7f5498a0d6bf 100644 --- a/velox/substrait/tests/CMakeLists.txt +++ b/velox/substrait/tests/CMakeLists.txt @@ -56,8 +56,8 @@ target_link_libraries( Boost::regex Boost::thread Boost::system - gtest - gtest_main + GTest::gtest + GTest::gtest_main Folly::folly gflags::gflags glog::glog diff --git a/velox/tpch/gen/tests/CMakeLists.txt b/velox/tpch/gen/tests/CMakeLists.txt index 746714ca41da..9bd7c6bdd4b1 100644 --- a/velox/tpch/gen/tests/CMakeLists.txt +++ b/velox/tpch/gen/tests/CMakeLists.txt @@ -20,5 +20,5 @@ target_link_libraries( velox_tpch_gen velox_type velox_vector - gtest - gtest_main) + GTest::gtest + GTest::gtest_main) diff --git a/velox/type/fbhive/tests/CMakeLists.txt b/velox/type/fbhive/tests/CMakeLists.txt index dab357a598ee..d7c4c456d9ed 100644 --- a/velox/type/fbhive/tests/CMakeLists.txt +++ b/velox/type/fbhive/tests/CMakeLists.txt @@ -23,6 +23,6 @@ target_link_libraries( velox_type_fbhive_test velox_type_fbhive velox_type - gtest - gtest_main - gmock) + GTest::gtest + GTest::gtest_main + GTest::gmock) diff --git a/velox/type/parser/tests/CMakeLists.txt b/velox/type/parser/tests/CMakeLists.txt index a76a846d53a0..5894a12867b3 100644 --- a/velox/type/parser/tests/CMakeLists.txt +++ b/velox/type/parser/tests/CMakeLists.txt @@ -20,6 +20,6 @@ target_link_libraries( velox_type_parser_test velox_type_parser velox_type - gtest - gtest_main - gmock) + GTest::gtest + GTest::gtest_main + GTest::gmock) diff --git a/velox/type/tests/CMakeLists.txt b/velox/type/tests/CMakeLists.txt index 252bef912ab5..226cc282598a 100644 --- a/velox/type/tests/CMakeLists.txt +++ b/velox/type/tests/CMakeLists.txt @@ -33,9 +33,9 @@ target_link_libraries( velox_type velox_common_base Folly::folly - gtest - gtest_main - gmock + GTest::gtest + GTest::gtest_main + GTest::gmock gflags::gflags glog::glog) @@ -47,8 +47,8 @@ target_link_libraries( velox_serialization Folly::folly ${FOLLY_BENCHMARK} - gtest - gtest_main + GTest::gtest + GTest::gtest_main gflags::gflags glog::glog) @@ -61,8 +61,8 @@ target_link_libraries( velox_serialization Folly::folly ${FOLLY_BENCHMARK} - gtest - gtest_main + GTest::gtest + GTest::gtest_main gflags::gflags glog::glog) @@ -75,8 +75,8 @@ target_link_libraries( velox_serialization Folly::folly ${FOLLY_BENCHMARK} - gtest - gtest_main + GTest::gtest + GTest::gtest_main gflags::gflags glog::glog) @@ -89,8 +89,8 @@ target_link_libraries( velox_serialization Folly::folly ${FOLLY_BENCHMARK} - gtest - gtest_main + GTest::gtest + GTest::gtest_main gflags::gflags glog::glog) @@ -103,8 +103,8 @@ target_link_libraries( velox_serialization Folly::folly ${FOLLY_BENCHMARK} - gtest - gtest_main + GTest::gtest + GTest::gtest_main gflags::gflags glog::glog) @@ -115,7 +115,7 @@ target_link_libraries( velox_type Folly::folly ${FOLLY_BENCHMARK} - gtest - gtest_main + GTest::gtest + GTest::gtest_main gflags::gflags glog::glog) diff --git a/velox/type/tz/tests/CMakeLists.txt b/velox/type/tz/tests/CMakeLists.txt index 6435e199af26..0844419aea4a 100644 --- a/velox/type/tz/tests/CMakeLists.txt +++ b/velox/type/tz/tests/CMakeLists.txt @@ -20,6 +20,6 @@ target_link_libraries( velox_type_tz_test velox_type_tz velox_exception - gtest - gtest_main + GTest::gtest + GTest::gtest_main pthread) diff --git a/velox/vector/arrow/tests/CMakeLists.txt b/velox/vector/arrow/tests/CMakeLists.txt index 0a2af976e0b5..c4a396812afe 100644 --- a/velox/vector/arrow/tests/CMakeLists.txt +++ b/velox/vector/arrow/tests/CMakeLists.txt @@ -22,7 +22,7 @@ target_link_libraries( velox_arrow_bridge velox_vector_test_lib arrow - gtest - gtest_main + GTest::gtest + GTest::gtest_main glog::glog dl) diff --git a/velox/vector/benchmarks/CMakeLists.txt b/velox/vector/benchmarks/CMakeLists.txt index 73dd8de08756..09d4a20f4b34 100644 --- a/velox/vector/benchmarks/CMakeLists.txt +++ b/velox/vector/benchmarks/CMakeLists.txt @@ -21,7 +21,7 @@ target_link_libraries( fmt::fmt) # This is a workaround for the use of VectorTestUtils.h which include gtest.h target_link_libraries( - velox_vector_hash_all_benchmark gtest) + velox_vector_hash_all_benchmark GTest::gtest) add_executable(velox_vector_selectivity_vector_benchmark SelectivityVectorBenchmark.cpp) diff --git a/velox/vector/fuzzer/tests/CMakeLists.txt b/velox/vector/fuzzer/tests/CMakeLists.txt index fe364cc5a15a..4b8fdb65f5d0 100644 --- a/velox/vector/fuzzer/tests/CMakeLists.txt +++ b/velox/vector/fuzzer/tests/CMakeLists.txt @@ -19,6 +19,6 @@ target_link_libraries( velox_vector_fuzzer_test velox_vector_fuzzer velox_memory - gtest - gtest_main - gmock) + GTest::gtest + GTest::gtest_main + GTest::gmock) diff --git a/velox/vector/tests/CMakeLists.txt b/velox/vector/tests/CMakeLists.txt index 31c215d51c74..cd60657f123b 100644 --- a/velox/vector/tests/CMakeLists.txt +++ b/velox/vector/tests/CMakeLists.txt @@ -57,8 +57,8 @@ target_link_libraries( Boost::regex Boost::thread Boost::system - gtest - gtest_main + GTest::gtest + GTest::gtest_main Folly::folly gflags::gflags glog::glog @@ -75,8 +75,8 @@ target_link_libraries( velox_buffer velox_type velox_vector_test_lib - gtest - gtest_main + GTest::gtest + GTest::gtest_main Folly::folly gflags::gflags glog::glog @@ -90,8 +90,8 @@ target_link_libraries( bias_vector_test velox_vector Boost::filesystem - gtest - gtest_main + GTest::gtest + GTest::gtest_main Folly::folly gflags::gflags glog::glog diff --git a/velox/vector/tests/utils/CMakeLists.txt b/velox/vector/tests/utils/CMakeLists.txt index 1cc0a23ac666..3898fd2626ff 100644 --- a/velox/vector/tests/utils/CMakeLists.txt +++ b/velox/vector/tests/utils/CMakeLists.txt @@ -14,4 +14,4 @@ add_library(velox_vector_test_lib VectorMaker.cpp VectorTestBase.cpp) target_link_libraries( - velox_vector_test_lib velox_vector gtest gtest_main) + velox_vector_test_lib velox_vector GTest::gtest GTest::gtest_main)