From 4043b7b0d863813f905d09d1cb9cf6ab3c410c96 Mon Sep 17 00:00:00 2001
From: Johannes Demel <jdemel@gnuradio.org>
Date: Mon, 19 Aug 2024 22:12:28 +0200
Subject: [PATCH] gtest: Make gtest an install dependency

It's probably a good thing to have googletest as an install dependency.

Signed-off-by: Johannes Demel <jdemel@gnuradio.org>
---
 tests/CMakeLists.txt                      | 35 ++++++++++-------------
 tests/googletest                          |  1 -
 tests/test_volk_32f_x3_sum_of_poly_32f.cc |  1 -
 3 files changed, 15 insertions(+), 22 deletions(-)
 delete mode 160000 tests/googletest

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 860adb74..fd9d8b8c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,9 +6,17 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later
 #
 
-add_subdirectory(googletest)
+if(NOT ENABLE_TESTING)
+    return()
+endif(NOT ENABLE_TESTING)
 
-find_package(fmt REQUIRED)
+find_package(fmt)
+find_package(GTest)
+
+if(NOT fmt_FOUND OR NOT GTest_FOUND)
+    message(warning "Missing fmtlib and/or googletest for this test suite")
+    return()
+endif(NOT fmt_FOUND OR NOT GTest_FOUND)
 
 file(GLOB volk_test_files "test_*.cc")
 
@@ -18,11 +26,11 @@ add_executable(
   ${volk_test_files}
 )
 
-target_link_libraries(
-  volk_tests
-  gtest_main
-  volk
-  fmt::fmt
+target_link_libraries(volk_tests
+  PRIVATE
+    GTest::gtest_main
+    volk
+    fmt::fmt
 )
 
 include(GoogleTest)
@@ -37,16 +45,3 @@ target_include_directories(volk_tests
     PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
 )
-
-# if(ENABLE_STATIC_LIBS)
-#     target_link_libraries(volk_tests PRIVATE volk_static)
-#     set_target_properties(volk_tests PROPERTIES LINK_FLAGS "-static")
-# else()
-#     target_link_libraries(volk_tests PRIVATE volk)
-# endif()
-
-# install(
-#     TARGETS volk_tests
-#     DESTINATION bin
-#     COMPONENT "volk"
-# )
\ No newline at end of file
diff --git a/tests/googletest b/tests/googletest
deleted file mode 160000
index 9a32aee2..00000000
--- a/tests/googletest
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9a32aee22d771387c494be2d8519fbdf46a713b2
diff --git a/tests/test_volk_32f_x3_sum_of_poly_32f.cc b/tests/test_volk_32f_x3_sum_of_poly_32f.cc
index 59c50ebf..27d972dc 100644
--- a/tests/test_volk_32f_x3_sum_of_poly_32f.cc
+++ b/tests/test_volk_32f_x3_sum_of_poly_32f.cc
@@ -137,5 +137,4 @@ TEST_P(volk_32f_x3_sum_of_poly_32f_test, unaligned)
 
 INSTANTIATE_TEST_SUITE_P(volk_32f_x3_sum_of_poly_32f,
                          volk_32f_x3_sum_of_poly_32f_test,
-                         //  testing::Values(8, 32)
                          testing::Values(7, 32, 128, 1023, 65535, 131071));