Fix find_package and linking for 'gtest' library (facebookincubator#1…

…0422) Summary: Fixes facebookincubator#10421 1. Use "GTest"(not `"gtest"` or `"GTEST"`) in `find_package` to solve the following warning: ``` CMake Warning at CMake/ResolveDependency.cmake:70 (find_package): By not providing "Findgtest.cmake" in CMAKE_MODULE_PATH this project has asked CMake to find a package configuration file provided by "gtest", but CMake did not find one. Could not find a package configuration file provided by "gtest" with any of the following names: gtestConfig.cmake gtest-config.cmake Add the installation prefix of "gtest" to CMAKE_PREFIX_PATH or set "gtest_DIR" to a directory containing one of the above files. If "gtest" provides a separate development package or SDK, be sure it has been installed. Call Stack (most recent call first): CMakeLists.txt:542 (resolve_dependency) ``` 2. Use `GTest::gtest` and `Gtest::gtest_main` in the `target_link_libraries` to solve the following error when 'gtest' is pre-installed(not using the BUNDLED way). See [1] ``` ld: library not found for -gtest ``` 3. Finally, because the compilation error of the precompiled 'gtest' library has been solved, we can pre-install the 'gtest' library in setup-macos.sh. [1] https://cmake.org/cmake/help/v3.30/module/FindGTest.html Pull Request resolved: facebookincubator#10422 Reviewed By: pedroerp Differential Revision: D61135221 Pulled By: xiaoxmeng fbshipit-source-id: 4963efcbb154e06cd413c707158255804a23c271
DanielHunte · Aug 12, 2024 · a6ca103 · a6ca103
1 parent 23c862e
commit a6ca103
Show file tree

Hide file tree

Showing 78 changed files with 246 additions and 245 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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})