Skip to content

Commit

Permalink
huh
Browse files Browse the repository at this point in the history
  • Loading branch information
abellgithub committed May 12, 2021
1 parent 254bbf2 commit af3391f
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 9 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ jobs:
source ../scripts/ci/conda/compile.sh
working-directory: ./pdal-feedstock

- uses: ilammy/msvc-dev-cmd@v1
if: matrix.platform == 'windows-latest'
- name: Test
shell: bash -l {0}
run: |
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:

steps:
- uses: actions/checkout@v2
- uses: ilammy/msvc-dev-cmd@v1
- uses: conda-incubator/setup-miniconda@v2
with:
channels: conda-forge
Expand Down
9 changes: 5 additions & 4 deletions scripts/ci/conda/examples.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,15 @@
export BASE=`pwd`

conda activate test
conda install compilers cmake ninja -y
conda install cmake ninja -y

if [ "$PLATFORM" == "windows-latest" ]; then

path=$(vswhere -nologo -property installationPath)
path="$path\VC\Auxiliary\Build\vcvars64.bat"
"$path"

export CC=cl.exe
export CXX=cl.exe
where cl
fi

for EXAMPLE in writing writing-filter writing-kernel \
writing-reader writing-writer
Expand All @@ -23,5 +20,9 @@ do
mkdir -p _build || exit 1
cd _build || exit 1
cmake -G "Ninja" .. \
-DCMAKE_CXX_COMPILER=cl \
-DCMAKE_C_COMPILER=cl \
-DPDAL_DIR=$CONDA_PREFIX/lib/cmake/PDAL && ninja
done

fi
2 changes: 1 addition & 1 deletion scripts/ci/osx/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ echo "Configuring build type '$BUILD_TYPE'"
mkdir build

conda update -n base -c defaults conda
conda install cmake ninja compilers -y
conda install cmake ninja -y

# can remove this after CF PDAL recipe adds Draco
conda install -c conda-forge draco pkgconfig -y
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/win/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ echo "Configuring build type '$BUILD_TYPE'"
mkdir build

conda update -n base -c defaults conda
conda install -c conda-forge pkgconfig cmake ninja compilers -y
conda install -c conda-forge pkgconfig cmake ninja -y

# can remove this after CF PDAL recipe adds Draco
conda install -c conda-forge draco -y
Expand Down

0 comments on commit af3391f

Please sign in to comment.