Skip to content

Commit

Permalink
Call cmake correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
tmadlener committed Sep 9, 2024
1 parent 8e74f51 commit 6e6ad23
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/lcg_linux_with_podio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
echo "::group::Build podio"
cd podio
echo "Building podio @"$(git log -1 --format=%H)
cmake .. -DCMAKE_CXX_STANDARD=${{ matrix.CXX_STANDARD }} \
cmake -DCMAKE_CXX_STANDARD=${{ matrix.CXX_STANDARD }} \
-DENABLE_SIO=ON \
-DENABLE_RNTUPLE=ON \
-DENABLE_DATASOURCE=ON \
Expand All @@ -41,7 +41,7 @@ jobs:
echo "::group::Build edm4hep"
cd $STARTDIR
echo "Building edm4hep"
cmake .. -DCMAKE_CXX_STANDARD=${{ matrix.CXX_STANDARD }} \
cmake -DCMAKE_CXX_STANDARD=${{ matrix.CXX_STANDARD }} \
-DCMAKE_INSTALL_PREFIX=$(pwd)/install \
-DUSE_EXTERNAL_CATCH2=OFF \
-G Ninja -B build
Expand All @@ -52,7 +52,7 @@ jobs:
echo "::group::Test downstream usage"
export CMAKE_PREFIX_PATH=$PWD/install:$CMAKE_PREFIX_PATH
cd test/downstream-project-cmake-test
cmake .. -DCMAKE_CXX_STANDARD=${{ matrix.CXX_STANDARD }} \
cmake -DCMAKE_CXX_STANDARD=${{ matrix.CXX_STANDARD }} \
-DCMAKE_INSTALL_PREFIX=$(pwd)/install \
-G Ninja -B build
cmake --build build -- -k0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
echo "::group::Build podio"
cd podio
echo "Building podio @"$(git log -1 --format=%H)
cmake .. -DCMAKE_CXX_STANDARD=20 \
cmake -DCMAKE_CXX_STANDARD=20 \
-DENABLE_SIO=ON \
-DBUILD_TESTING=OFF \
-DCMAKE_INSTALL_PREFIX=$(pwd)install \
Expand All @@ -33,7 +33,7 @@ jobs:
export PYTHONPATH=$(python -m site --user-site):$PYTHONPATH
export PATH=/root/.local/bin:$PATH
pip install argparse --user
cmake .. -DENABLE_SIO=ON \
cmake -DENABLE_SIO=ON \
-DCMAKE_CXX_STANDARD=20 \
-DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror "\
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
Expand Down

0 comments on commit 6e6ad23

Please sign in to comment.