From c6b6c84fb7d06956ea7e9a1161ea6ee8505c5c64 Mon Sep 17 00:00:00 2001 From: Aaron Jomy Date: Tue, 18 Feb 2025 10:01:14 +0100 Subject: [PATCH] [ci] Prefix cmake options for CppInterOp Based on the change in CppInterOp: https://github.com/compiler-research/CppInterOp/pull/505 that prefixes the build option with `CPPINTEROP` --- .github/workflows/MacOS.yml | 4 ++-- .github/workflows/Ubuntu.yml | 4 ++-- .github/workflows/Windows.yml | 4 ++-- .github/workflows/emscripten.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml index 1cf89129..8a66094e 100644 --- a/.github/workflows/MacOS.yml +++ b/.github/workflows/MacOS.yml @@ -477,8 +477,8 @@ jobs: cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]') if [[ "${cling_on}" == "ON" ]]; then cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \ - -DUSE_CLING=ON \ - -DUSE_REPL=OFF \ + -DCPPINTEROP_USE_CLING=ON \ + -DCPPINTEROP_USE_REPL=OFF \ -DCPPINTEROP_INCLUDE_DOCS=${{ matrix.documentation }} \ -DCling_DIR=$LLVM_BUILD_DIR/tools/cling \ -DLLVM_DIR=$LLVM_BUILD_DIR/lib/cmake/llvm \ diff --git a/.github/workflows/Ubuntu.yml b/.github/workflows/Ubuntu.yml index 3b506df9..440ec5d2 100644 --- a/.github/workflows/Ubuntu.yml +++ b/.github/workflows/Ubuntu.yml @@ -440,8 +440,8 @@ jobs: cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]') if [[ "${cling_on}" == "ON" ]]; then cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \ - -DUSE_CLING=ON \ - -DUSE_REPL=OFF \ + -DCPPINTEROP_USE_CLING=ON \ + -DCPPINTEROP_USE_REPL=OFF \ -DCPPINTEROP_INCLUDE_DOCS=${{ matrix.documentation }} \ -DCling_DIR=$LLVM_BUILD_DIR/tools/cling \ -DLLVM_DIR=$LLVM_BUILD_DIR/lib/cmake/llvm \ diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml index f22f2eff..ebf64481 100644 --- a/.github/workflows/Windows.yml +++ b/.github/workflows/Windows.yml @@ -377,8 +377,8 @@ jobs: if ( "${{ matrix.cling }}" -imatch "On" ) { cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} ` - -DUSE_CLING=ON ` - -DUSE_REPL=OFF ` + -DCPPINTEROP_USE_CLING=ON ` + -DCPPINTEROP_USE_REPL=OFF ` -DCling_DIR="$env:LLVM_BUILD_DIR\tools\cling" ` -DLLVM_DIR="$env:LLVM_BUILD_DIR" ` -DLLVM_ENABLE_WERROR=On ` diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index 99bdbc30..8975ddd5 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -598,8 +598,8 @@ jobs: export CPPINTEROP_BUILD_DIR=$PWD if [[ "${cling_on}" == "ON" ]]; then emcmake cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \ - -DUSE_CLING=ON \ - -DUSE_REPL=OFF \ + -DCPPINTEROP_USE_CLING=ON \ + -DCPPINTEROP_USE_REPL=OFF \ -DCMAKE_PREFIX_PATH=$PREFIX \ -DCling_DIR=$LLVM_BUILD_DIR/tools/cling \ -DLLVM_DIR=$LLVM_BUILD_DIR/lib/cmake/llvm \