aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoward Butler <howard@hobu.co>2020-03-02 15:30:29 -0600
committerHoward Butler <howard@hobu.co>2020-03-02 15:30:29 -0600
commit453f86ddcb892b18210a9417273a4c839e805488 (patch)
tree05972ab9e9fb1882c93b2f17f12b85d9fcd15b87
parent25d62f5015825865b0e3afe0d5107b73651ae836 (diff)
downloadPROJ-453f86ddcb892b18210a9417273a4c839e805488.tar.gz
PROJ-453f86ddcb892b18210a9417273a4c839e805488.zip
typoland
-rw-r--r--scripts/azp/osx.yml4
-rw-r--r--scripts/azp/win.yml2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/azp/osx.yml b/scripts/azp/osx.yml
index ffc2fa23..c23123e3 100644
--- a/scripts/azp/osx.yml
+++ b/scripts/azp/osx.yml
@@ -29,7 +29,7 @@ jobs:
conda config --set always_yes True --set show_channel_urls True
conda config --add channels conda-forge
conda config --set channel_priority strict
- conda install --yes --quiet --name proj curl cmake ninja libtiff sqlite conda-build ninja conda-forge-ci-setup=2 -y
+ conda install --yes --quiet --name proj curl cmake ninja libtiff sqlite conda-build ninja conda-forge-ci-setup=2 -y
displayName: Install PROJ dependencies
- script: |
source activate proj
@@ -48,7 +48,7 @@ jobs:
-DCMAKE_LIBRARY_PATH:FILEPATH="$CONDA_PREFIX/lib" \
-DCMAKE_INCLUDE_PATH:FILEPATH="$CONDA_PREFIX/include" \
-DSQLITE3_INCLUDE_DIR:FILEPATH="$CONDA_PREFIX/include" \
- -DSQLITE3_LIBRARY:FILEPATH="$CONDA_PREFIX/lib/libsqlite3.dylib \
+ -DSQLITE3_LIBRARY:FILEPATH="$CONDA_PREFIX/lib/libsqlite3.dylib" \
..
displayName: 'CMake'
- script: |
diff --git a/scripts/azp/win.yml b/scripts/azp/win.yml
index fd8f6c9a..ceaf9e67 100644
--- a/scripts/azp/win.yml
+++ b/scripts/azp/win.yml
@@ -34,7 +34,7 @@ jobs:
-DCMAKE_INCLUDE_PATH:FILEPATH="%CONDA_PREFIX%/Library/include" ^
-DCMAKE_C_FLAGS="/WX" \
-DCMAKE_CXX_FLAGS="/WX" \
- -DBUILD_SHARED_LIBS="ON"
+ -DBUILD_SHARED_LIBS="ON" \
..
displayName: 'CMake'
- script: |