Skip to content

Commit

Permalink
Update CI scripts to use USE_ROOT cmake arg
Browse files Browse the repository at this point in the history
  • Loading branch information
nathanwbrei committed Jul 26, 2021
1 parent ca8b00c commit 299eb8c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ccpp-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
run: |
mkdir -p $GITHUB_WORKSPACE/build
cd $GITHUB_WORKSPACE/build
cmake ../ -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/Linux
cmake ../ -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/Linux -DUSE_ROOT=Off
- name: make
run: |
cd $GITHUB_WORKSPACE/build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ccpp-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: |
mkdir -p $GITHUB_WORKSPACE/build
cd $GITHUB_WORKSPACE/build
cmake ../ -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/Darwin
cmake ../ -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/Darwin -DUSE_ROOT=Off
- name: make
run: |
cd $GITHUB_WORKSPACE/build
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/JTestRoot/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

if(${USE_ROOT})
find_package(ROOT)
find_package(ROOT REQUIRED)
include(${ROOT_USE_FILE})

# Generate ROOT dictionaries for each of our ROOT object types
Expand Down

0 comments on commit 299eb8c

Please sign in to comment.