From 3a5ad4a8728896f20ebf1b9469d3fcaee413e755 Mon Sep 17 00:00:00 2001 From: Vassil Vassilev Date: Sun, 7 Jan 2024 19:17:32 +0000 Subject: [PATCH] [cmake] Fix googlebenchmark build location. --- .github/workflows/ci.yml | 4 ++-- cmake/modules/GoogleBenchmark.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 05772e63c..3cdc99091 100644 --- 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 index 70c05e069..8e74543bd 100644 --- 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.