Skip to content

Commit

Permalink
Set PDAL_DIR
Browse files Browse the repository at this point in the history
  • Loading branch information
pomadchin committed Jan 8, 2024
1 parent 0a92288 commit f95dc19
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:

- uses: conda-incubator/setup-miniconda@v3
with:
miniconda-version: "latest"
# auto-update-conda: true
auto-activate-base: true
activate-environment: "pdal-java"
channels: conda-forge
Expand All @@ -70,7 +70,10 @@ jobs:
run: sbt scalafmtCheckAll

- name: Build project
run: sbt +test
run: |
export PDAL_DIR=$CONDA/envs/pdal-java/
echo "PDAL_DIR: $PDAL_DIR"
sbt +test
- uses: actions/upload-artifact@v3
with:
Expand Down
4 changes: 4 additions & 0 deletions native/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ if (JNI_FOUND)
endif()

if (NOT PDAL_BUILD)
if(DEFINED ENV{PDAL_DIR})
set(PDAL_DIR "$ENV{PDAL_DIR}")
endif()

find_package(PDAL 2.0.0 REQUIRED CONFIG)
endif()

Expand Down

0 comments on commit f95dc19

Please sign in to comment.