From 0950e3c9c118f4277deb1cdf42857955dbd97b4f Mon Sep 17 00:00:00 2001 From: Carl Pearson Date: Tue, 9 Apr 2024 08:37:21 -0600 Subject: [PATCH] CI: use Kokkos_ROOT in CI --- .github/workflows/linux.yaml | 4 ++-- .github/workflows/osx.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml index 0566b58e..1f52189a 100644 --- a/.github/workflows/linux.yaml +++ b/.github/workflows/linux.yaml @@ -44,7 +44,7 @@ jobs: cmake --build "$KOKKOS_BUILD" --parallel $(nproc) -t install - name: Build KokkosComm run: | - cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_DIR="$KOKKOS_INSTALL/lib/cmake/Kokkos" -DCMAKE_BUILD_TYPE=Release + cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_ROOT="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=Release VERBOSE=1 cmake --build "$COMM_BUILD" - name: Test KokkosComm run: | @@ -76,7 +76,7 @@ jobs: cmake --build "$KOKKOS_BUILD" --parallel $(nproc) -t install - name: Build KokkosComm run: | - cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_DIR="$KOKKOS_INSTALL/lib/cmake/Kokkos" -DCMAKE_BUILD_TYPE=Debug + cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_ROOT="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=Debug VERBOSE=1 cmake --build "$COMM_BUILD" - name: Test KokkosComm run: | diff --git a/.github/workflows/osx.yaml b/.github/workflows/osx.yaml index 1097fa92..65cdd94e 100644 --- a/.github/workflows/osx.yaml +++ b/.github/workflows/osx.yaml @@ -38,7 +38,7 @@ jobs: cmake --build "$KOKKOS_BUILD" --parallel $(nproc) -t install - name: Build KokkosComm run: | - cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_DIR="$KOKKOS_INSTALL/lib/cmake/Kokkos" -DCMAKE_BUILD_TYPE=Debug + cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_ROOT="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=Debug VERBOSE=1 cmake --build "$COMM_BUILD" - name: Test KokkosComm run: | @@ -70,7 +70,7 @@ jobs: cmake --build "$KOKKOS_BUILD" --parallel $(nproc) -t install - name: Build KokkosComm run: | - cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_DIR="$KOKKOS_INSTALL/lib/cmake/Kokkos" -DCMAKE_BUILD_TYPE=Release + cmake -S "$COMM_SRC" -B "$COMM_BUILD" -DKokkos_ROOT="$KOKKOS_INSTALL" -DCMAKE_BUILD_TYPE=Release VERBOSE=1 cmake --build "$COMM_BUILD" - name: Test KokkosComm run: |