Set PDAL_DIR

PDAL · Jan 8, 2024 · 83f9d12 · 83f9d12
1 parent 0a92288
commit 83f9d12
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,19 +58,27 @@ jobs:
 
       - uses: conda-incubator/setup-miniconda@v3
         with:
-          miniconda-version: "latest"
-          auto-activate-base: true
+          # auto-update-conda: true
+          # auto-activate-base: true
           activate-environment: "pdal-java"
           channels: conda-forge
 
       - name: Install PDAL
         run: conda install pdal=${{ matrix.pdal }}
 
-      - name: Check formatting
-        run: sbt scalafmtCheckAll
+      # - name: Check formatting
+      #   run: sbt scalafmtCheckAll
 
       - name: Build project
-        run: sbt +test
+        run: |
+          # export PDAL_DIR=$CONDAenvs/pdal-java/
+          echo "CONA: $CONDA"
+          ls $CONDA
+          echo "========"
+          ls ${CONDA}/envs
+          echo "======="
+          which pdal
+          sbt +test
 
       - uses: actions/upload-artifact@v3
         with:

diff --git a/native/src/CMakeLists.txt b/native/src/CMakeLists.txt
@@ -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()