[cmake] Fix googlebenchmark build location.

vaithak · Jan 7, 2024 · 3a5ad4a · 3a5ad4a
1 parent f0d4988
commit 3a5ad4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -794,9 +794,9 @@ jobs:
         cmake --build . --target benchmark-clad -j4
 
         # Compare:
-        cd benchmark
         pip3 install -r ./googlebenchmark-prefix/src/googlebenchmark/tools/requirements.txt
-        COMPARER='./googlebenchmark-prefix/src/googlebenchmark/tools/compare.py'
+        COMPARER="$(pwd)/googlebenchmark-prefix/src/googlebenchmark/tools/compare.py"
+        cd benchmark
         for baseline in *-$hash.json
         do
           common=${baseline%$hash.json}

diff --git a/cmake/modules/GoogleBenchmark.cmake b/cmake/modules/GoogleBenchmark.cmake
@@ -1,6 +1,6 @@
 include(ExternalProject)
 
-set(GBENCHMARK_PREFIX "${CMAKE_BINARY_DIR}/benchmark/googlebenchmark-prefix")
+set(GBENCHMARK_PREFIX "${CMAKE_BINARY_DIR}/googlebenchmark-prefix")
 set(GBENCHMARK_LIBRARY_NAME ${CMAKE_STATIC_LIBRARY_PREFIX}benchmark${CMAKE_STATIC_LIBRARY_SUFFIX})
 
 # Remove the coverage flags when compiling external libraries.