merge benchmark into integration test

deepmodeling · Jan 26, 2024 · ca35da7 · ca35da7
1 parent 5d35c57
commit ca35da7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 46 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
 
       - name: Build
         run: |
-          cmake -B build -DBUILD_TESTING=ON -DENABLE_DEEPKS=ON -DENABLE_LIBXC=ON -DENABLE_LIBRI=ON -DENABLE_PAW=ON
+          cmake -B build -DBUILD_TESTING=ON -DENABLE_DEEPKS=ON -DENABLE_LIBXC=ON -DENABLE_LIBRI=ON -DENABLE_PAW=ON -DENABLE_GOOGLEBENCH=ON
           cmake --build build -j8
           cmake --install build
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -600,6 +600,7 @@ 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(
       benchmark
@@ -608,11 +609,8 @@ IF (ENABLE_GOOGLEBENCH)
       GIT_SHALLOW TRUE
       GIT_PROGRESS TRUE 
     )
+    set(BENCHMARK_ENABLE_TESTING OFF)
     FetchContent_MakeAvailable(benchmark)
-    set(BENCHMARK_USE_BUNDLED_GTEST OFF CACHE INTERNAL "disable benchmark bundled gtest")
-    set(CMAKE_BUILD_TYPE "Release" CACHE INTERNAL "build benchmark in release mode")
-    set(BENCHMARK_ENABLE_TESTING OFF CACHE INTERNAL "disable benchmark testing")
-    add_subdirectory(tests)
   endif()
 endif()