Skip to content

Commit 62b6937

Browse files
committed
[ci] Prefix cmake options for CppInterOp
Based on the change in CppInterOp: compiler-research/CppInterOp#505 that prefixes the build option with `CPPINTEROP`
1 parent 6f11a5f commit 62b6937

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

.github/workflows/MacOS.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,8 +477,8 @@ jobs:
477477
cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
478478
if [[ "${cling_on}" == "ON" ]]; then
479479
cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
480-
-DUSE_CLING=ON \
481-
-DUSE_REPL=OFF \
480+
-DCPPINTEROP_USE_CLING=ON \
481+
-DCPPINTEROP_USE_REPL=OFF \
482482
-DCPPINTEROP_INCLUDE_DOCS=${{ matrix.documentation }} \
483483
-DCling_DIR=$LLVM_BUILD_DIR/tools/cling \
484484
-DLLVM_DIR=$LLVM_BUILD_DIR/lib/cmake/llvm \

.github/workflows/Ubuntu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,8 @@ jobs:
440440
cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
441441
if [[ "${cling_on}" == "ON" ]]; then
442442
cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
443-
-DUSE_CLING=ON \
444-
-DUSE_REPL=OFF \
443+
-DCPPINTEROP_USE_CLING=ON \
444+
-DCPPINTEROP_USE_REPL=OFF \
445445
-DCPPINTEROP_INCLUDE_DOCS=${{ matrix.documentation }} \
446446
-DCling_DIR=$LLVM_BUILD_DIR/tools/cling \
447447
-DLLVM_DIR=$LLVM_BUILD_DIR/lib/cmake/llvm \

.github/workflows/Windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,8 @@ jobs:
377377
if ( "${{ matrix.cling }}" -imatch "On" )
378378
{
379379
cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
380-
-DUSE_CLING=ON `
381-
-DUSE_REPL=OFF `
380+
-DCPPINTEROP_USE_CLING=ON `
381+
-DCPPINTEROP_USE_REPL=OFF `
382382
-DCling_DIR="$env:LLVM_BUILD_DIR\tools\cling" `
383383
-DLLVM_DIR="$env:LLVM_BUILD_DIR" `
384384
-DLLVM_ENABLE_WERROR=On `

.github/workflows/emscripten.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,8 +598,8 @@ jobs:
598598
export CPPINTEROP_BUILD_DIR=$PWD
599599
if [[ "${cling_on}" == "ON" ]]; then
600600
emcmake cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
601-
-DUSE_CLING=ON \
602-
-DUSE_REPL=OFF \
601+
-DCPPINTEROP_USE_CLING=ON \
602+
-DCPPINTEROP_USE_REPL=OFF \
603603
-DCMAKE_PREFIX_PATH=$PREFIX \
604604
-DCling_DIR=$LLVM_BUILD_DIR/tools/cling \
605605
-DLLVM_DIR=$LLVM_BUILD_DIR/lib/cmake/llvm \

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ if(DEFINED CppInterOp_DIR)
2323
else()
2424
set(_interop_install_dir ${CMAKE_BINARY_DIR}/CppInterOp/install)
2525

26-
if(DEFINED USE_CLING)
27-
list(APPEND _interop_cmake_args "-DUSE_CLING=${USE_CLING}")
26+
if(DEFINED CPPINTEROP_USE_CLING)
27+
list(APPEND _interop_cmake_args "-DCPPINTEROP_USE_CLING=${CPPINTEROP_USE_CLING}")
2828
endif()
2929

3030
if(DEFINED Cling_DIR)

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,22 +181,22 @@ cd CppInterOp\build\
181181

182182
Now if you want to build CppInterOp with Clang-REPL then execute the following commands on Linux and MacOS
183183
```
184-
cmake -DBUILD_SHARED_LIBS=ON -DUSE_CLING=Off -DUSE_REPL=ON -DLLVM_DIR=$LLVM_DIR/build/lib/cmake/llvm -DClang_DIR=$LLVM_DIR/build/lib/cmake/clang -DCMAKE_INSTALL_PREFIX=$CPPINTEROP_DIR ..
184+
cmake -DBUILD_SHARED_LIBS=ON -DCPPINTEROP_USE_CLING=Off -DCPPINTEROP_USE_REPL=ON -DLLVM_DIR=$LLVM_DIR/build/lib/cmake/llvm -DClang_DIR=$LLVM_DIR/build/lib/cmake/clang -DCMAKE_INSTALL_PREFIX=$CPPINTEROP_DIR ..
185185
cmake --build . --target install --parallel $(nproc --all)
186186
```
187187
and
188188
```
189-
cmake -DUSE_CLING=Off -DUSE_REPL=ON -DLLVM_DIR=$LLVM_DIR\build\lib\cmake\llvm -DClang_DIR=$LLVM_DIR\build\lib\cmake\clang -DCMAKE_INSTALL_PREFIX=$env:CPPINTEROP_DIR ..
189+
cmake -DCPPINTEROP_USE_CLING=Off -DCPPINTEROP_USE_REPL=ON -DLLVM_DIR=$LLVM_DIR\build\lib\cmake\llvm -DClang_DIR=$LLVM_DIR\build\lib\cmake\clang -DCMAKE_INSTALL_PREFIX=$env:CPPINTEROP_DIR ..
190190
cmake --build . --target install --parallel $env:ncpus
191191
```
192192
on Windows. If alternatively you would like to install CppInterOp with Cling then execute the following commands on Linux and MacOS
193193
```
194-
cmake -DBUILD_SHARED_LIBS=ON -DUSE_CLING=ON -DUSE_REPL=Off -DCling_DIR=$LLVM_DIR/build/tools/cling -DLLVM_DIR=$LLVM_DIR/build/lib/cmake/llvm -DClang_DIR=$LLVM_DIR/build/lib/cmake/clang -DCMAKE_INSTALL_PREFIX=$CPPINTEROP_DIR ..
194+
cmake -DBUILD_SHARED_LIBS=ON -DCPPINTEROP_USE_CLING=ON -DCPPINTEROP_USE_REPL=Off -DCling_DIR=$LLVM_DIR/build/tools/cling -DLLVM_DIR=$LLVM_DIR/build/lib/cmake/llvm -DClang_DIR=$LLVM_DIR/build/lib/cmake/clang -DCMAKE_INSTALL_PREFIX=$CPPINTEROP_DIR ..
195195
cmake --build . --target install --parallel $(nproc --all)
196196
```
197197
and
198198
```
199-
cmake -DUSE_CLING=ON -DUSE_REPL=Off -DCling_DIR=$LLVM_DIR\build\tools\cling -DLLVM_DIR=$LLVM_DIR\build\lib\cmake\llvm -DClang_DIR=$LLVM_DIR\build\lib\cmake\clang -DCMAKE_INSTALL_PREFIX=$env:CPPINTEROP_DIR ..
199+
cmake -DCPPINTEROP_USE_CLING=ON -DCPPINTEROP_USE_REPL=Off -DCling_DIR=$LLVM_DIR\build\tools\cling -DLLVM_DIR=$LLVM_DIR\build\lib\cmake\llvm -DClang_DIR=$LLVM_DIR\build\lib\cmake\clang -DCMAKE_INSTALL_PREFIX=$env:CPPINTEROP_DIR ..
200200
cmake --build . --target install --parallel $env:ncpus
201201
```
202202

0 commit comments

Comments
 (0)