diff options
| author | Howard Butler <howard@hobu.co> | 2020-03-02 15:24:39 -0600 |
|---|---|---|
| committer | Howard Butler <howard@hobu.co> | 2020-03-02 15:24:39 -0600 |
| commit | 25d62f5015825865b0e3afe0d5107b73651ae836 (patch) | |
| tree | 30bbf6c19b44d72f5ed92ab1c268ec297e8903dc | |
| parent | 21a81035587750e7da79b0b77ca781a28ca9dc7a (diff) | |
| download | PROJ-25d62f5015825865b0e3afe0d5107b73651ae836.tar.gz PROJ-25d62f5015825865b0e3afe0d5107b73651ae836.zip | |
be explicit with SQLITE for conda/osx
| -rw-r--r-- | scripts/azp/osx.yml | 4 | ||||
| -rw-r--r-- | scripts/azp/win.yml | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/scripts/azp/osx.yml b/scripts/azp/osx.yml index b822175d..ffc2fa23 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 @@ -47,6 +47,8 @@ jobs: cmake -G Ninja \ -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 \ .. displayName: 'CMake' - script: | diff --git a/scripts/azp/win.yml b/scripts/azp/win.yml index 5b9f969a..fd8f6c9a 100644 --- a/scripts/azp/win.yml +++ b/scripts/azp/win.yml @@ -33,7 +33,8 @@ jobs: -DCMAKE_LIBRARY_PATH:FILEPATH="%CONDA_PREFIX%/Library/lib" ^ -DCMAKE_INCLUDE_PATH:FILEPATH="%CONDA_PREFIX%/Library/include" ^ -DCMAKE_C_FLAGS="/WX" \ - -DCMAKE_CXX_FLAGS="/WX" + -DCMAKE_CXX_FLAGS="/WX" \ + -DBUILD_SHARED_LIBS="ON" .. displayName: 'CMake' - script: | |