fix benchmark cmake errors

Author: jieli-matrix

CMakeLists.txt

@@ -568,52 +568,26 @@ if(INFO)
   # modifications on blas_connector and lapack_connector
 endif()
 
-IF (BUILD_TESTING)
-  set_if_higher(CMAKE_CXX_STANDARD 14) # Required in orbital
-  include(CTest)
-  enable_testing()
-  find_package(GTest HINTS /usr/local/lib/ ${GTEST_DIR})
-  if(NOT ${GTest_FOUND})
+#  Add performance test in abacus
+IF (ENABLE_GOOGLEBENCH)
+  set(BUILD_TESTING ON)
+  find_package(benchmark HINTS ${BENCHMARK_DIR})
+  if(NOT ${benchmark_FOUND})
+    set(BENCHMARK_USE_BUNDLED_GTEST OFF)
     include(FetchContent)
     FetchContent_Declare(
-      googletest
-      GIT_REPOSITORY https://github.com/google/googletest.git
+      benchmark
+      GIT_REPOSITORY https://github.com/google/benchmark.git
       GIT_TAG "origin/main"
       GIT_SHALLOW TRUE
       GIT_PROGRESS TRUE
     )
-    FetchContent_MakeAvailable(googletest)
+    FetchContent_MakeAvailable(benchmark)
   endif()
-  # TODO: Try the GoogleTest module.
-  # https://cmake.org/cmake/help/latest/module/GoogleTest.html
-  add_subdirectory(tests) # Contains integration tests
-
-  function(AddTest) # function for UT
-    cmake_parse_arguments(UT "DYN" "TARGET" "LIBS;DYN_LIBS;STATIC_LIBS;SOURCES;DEPENDS" ${ARGN})
-    add_executable(${UT_TARGET} ${UT_SOURCES})
-
-    if(ENABLE_COVERAGE)
-      add_coverage(${UT_TARGET})
-    endif()
-
-    #dependencies & link library
-    target_link_libraries(${UT_TARGET} ${UT_LIBS}
-      Threads::Threads GTest::gtest_main GTest::gmock_main)
-    if(USE_OPENMP)
-      target_link_libraries(${UT_TARGET} OpenMP::OpenMP_CXX)
-    endif()
-    install(TARGETS ${UT_TARGET} DESTINATION ${CMAKE_BINARY_DIR}/tests )
-    add_test(NAME ${UT_TARGET}
-      COMMAND ${UT_TARGET}
-      WORKING_DIRECTORY $<TARGET_FILE_DIR:${UT_TARGET}>
-    )
-  endfunction(AddTest)
 endif()
 
-
-#  Add performance test in abacus
-IF (ENABLE_GOOGLEBENCH)
-  set(CMAKE_CXX_STANDARD 14) # Required in orbital
+IF (BUILD_TESTING)
+  set_if_higher(CMAKE_CXX_STANDARD 14) # Required in orbital
   include(CTest)
   enable_testing()
   find_package(GTest HINTS /usr/local/lib/ ${GTEST_DIR})
@@ -628,37 +602,27 @@ IF (ENABLE_GOOGLEBENCH)
     )
     FetchContent_MakeAvailable(googletest)
   endif()
+  # TODO: Try the GoogleTest module.
+  # https://cmake.org/cmake/help/latest/module/GoogleTest.html
+  add_subdirectory(tests) # Contains integration tests
 
-  find_package(benchmark REQUIRED)
-  if(NOT ${benchmark_FOUND})
-    include(FetchContent)
-    FetchContent_Declare(
-      benchmark
-      GIT_REPOSITORY https://github.com/google/benchmark.git
-      GIT_TAG "origin/main"
-      GIT_SHALLOW TRUE
-      GIT_PROGRESS TRUE
-    )
-    FetchContent_MakeAvailable(benchmark)
-  endif()
-
-  function(AddPerfTest) # function for UT
-    add_compile_options(-O2)
+  function(AddTest) # function for UT
     cmake_parse_arguments(UT "DYN" "TARGET" "LIBS;DYN_LIBS;STATIC_LIBS;SOURCES;DEPENDS" ${ARGN})
     add_executable(${UT_TARGET} ${UT_SOURCES})
 
     if(ENABLE_COVERAGE)
       add_coverage(${UT_TARGET})
     endif()
 
-    
-    # Link Google Benchmark to the project
-    target_link_libraries(${UT_TARGET} benchmark::benchmark)
-
-
     #dependencies & link library
-    target_link_libraries(${UT_TARGET} ${UT_LIBS}
-      Threads::Threads GTest::gtest_main GTest::gmock_main)
+    if(ENABLE_GOOGLEBENCH)
+      target_link_libraries(${UT_TARGET} ${UT_LIBS}
+        Threads::Threads GTest::gtest_main GTest::gmock_main benchmark::benchmark)
+      else()
+        target_link_libraries(${UT_TARGET} ${UT_LIBS}
+          Threads::Threads GTest::gtest_main GTest::gmock_main)
+    endif()
+      
     if(USE_OPENMP)
       target_link_libraries(${UT_TARGET} OpenMP::OpenMP_CXX)
     endif()
@@ -668,10 +632,8 @@ IF (ENABLE_GOOGLEBENCH)
       WORKING_DIRECTORY $<TARGET_FILE_DIR:${UT_TARGET}>
     )
   endfunction(AddTest)
-endif()
-
-
 
+endif()
 
 add_subdirectory(source)