Reenable benchmarks

Skip benchmarks that depend on Google Benchmark
arborx · Aug 15, 2023 · adb42b7 · adb42b7
1 parent 5073fa6
commit adb42b7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -39,7 +39,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="/EHsc /bigobj" -DKokkos_ROOT="C:\kokkos-install" ${{ steps.vcpkg.outputs.vcpkg-cmake-config }} -DARBORX_ENABLE_MPI=OFF -DARBORX_ENABLE_TESTS=ON -DARBORX_ENABLE_EXAMPLES=ON -DARBORX_ENABLE_BENCHMARKS=OFF ..
+        cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="/EHsc /bigobj" -DKokkos_ROOT="C:\kokkos-install" ${{ steps.vcpkg.outputs.vcpkg-cmake-config }} -DARBORX_ENABLE_MPI=OFF -DARBORX_ENABLE_TESTS=ON -DARBORX_ENABLE_EXAMPLES=ON -DARBORX_ENABLE_BENCHMARKS=ON ..
     - name: Build ArborX
       shell: bash
       run: |

diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
@@ -4,11 +4,15 @@ find_package(benchmark 1.5.4 REQUIRED)
 message(STATUS "Found benchmark: ${benchmark_DIR} (version \"${benchmark_VERSION}\")")
 
 add_subdirectory(brute_force_vs_bvh)
-add_subdirectory(bvh_driver)
 add_subdirectory(dbscan)
-add_subdirectory(develop)
 add_subdirectory(execution_space_instances)
 add_subdirectory(union_find)
+if(NOT WIN32)
+  # FIXME: for now, skip benchmarks using Google benchmark
+  # when building for Windows
+  add_subdirectory(bvh_driver)
+  add_subdirectory(develop)
+endif()
 
 if (ARBORX_ENABLE_MPI)
   add_subdirectory(distributed_tree_driver)