Forwarding CXX name

armfazh · Nov 30, 2019 · e9d2c40 · e9d2c40
1 parent 0f0829b
commit e9d2c40
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/oncici.yml b/.github/workflows/oncici.yml
@@ -6,9 +6,15 @@ jobs:
   build:
     name: Benchmarking
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        compiler: [ [gcc,g++], [clang,clang++] ]
     steps:
     - uses: actions/checkout@master
     - name: Building
+      env:
+        CC: ${{ matrix.compiler[0] }}
+        CXX: ${{ matrix.compiler[1] }}
       run: |
         mkdir build
         cd build
@@ -17,11 +23,11 @@ jobs:
     - name: Benchmarking
       run: |
         cd build
-        bin/gbench --benchmark_out=timings.txt --benchmark_out_format=console
+        bin/gbench --benchmark_out=timings_${{ matrix.compiler[0] }}.txt --benchmark_out_format=console
     - uses: actions/upload-artifact@v1
       with:
         name: Timings
-        path: build/timings.txt
+        path: build/timings_${{ matrix.compiler[0] }}.txt
   test:
     name: Testing
     runs-on: ubuntu-latest

diff --git a/bench/CMakeLists.txt b/bench/CMakeLists.txt
@@ -8,6 +8,7 @@ set(GBENCH_VERSION "v1.5.0")
 ExternalProject_Add(benchmark-download
   URL            "https://api.github.com/repos/google/benchmark/tarball/${GBENCH_VERSION}"
   CMAKE_ARGS     -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}
+                 -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
                  -DCMAKE_POSITION_INDEPENDENT_CODE=ON
                  -DCMAKE_BUILD_TYPE=Release
                  -DBENCHMARK_ENABLE_TESTING=OFF

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -9,6 +9,7 @@ ExternalProject_Add(googletest-download
   URL            "https://api.github.com/repos/google/googletest/tarball/${GTEST_VERSION}"
   CMAKE_ARGS     -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}
                  -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+                 -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
   TEST_COMMAND   ""
   UPDATE_COMMAND ""
 )