Skip to content

Commit

Permalink
try --only-deps for PDAL dependencies on azp/linux
Browse files Browse the repository at this point in the history
  • Loading branch information
hobu committed Feb 7, 2020
1 parent 65fec47 commit 1e6b301
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 16 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ mark_as_advanced(CMAKE_VERBOSE_MAKEFILE)
set(PDAL_API_VERSION "9")
set(PDAL_BUILD_VERSION "10")

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

Expand Down
3 changes: 2 additions & 1 deletion scripts/azp/win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ jobs:
ECHO ON
call activate pdal
call conda config --set always_yes True --set show_channel_urls True
call conda install --yes --quiet --name pdal -c conda-forge geotiff laszip nitro curl gdal cmake eigen ninja libgdal zstd numpy xz libxml2 laz-perf qhull sqlite hdf5 tiledb conda-build ninja -y
call conda install --yes --quiet --name pdal -c conda-forge conda-build ninja -y
call conda install --yes --quiet --name pdal -c conda-forge pdal --only-deps -y
displayName: Install PDAL dependencies
- script: |
ECHO ON
Expand Down
16 changes: 2 additions & 14 deletions scripts/conda/win64.bat
Original file line number Diff line number Diff line change
@@ -1,32 +1,21 @@
set CONDA_ENVIRO=pdal-build

<<<<<<< Updated upstream
=======
REM del /s /q %CONDA_ENVIRO%
mkdir %CONDA_ENVIRO%
pushd %CONDA_ENVIRO%

>>>>>>> Stashed changes
call conda activate %CONDA_ENVIRO%

cd %CONDA_ENVIRO%

echo "conda prefix" %CONDA_PREFIX%
<<<<<<< Updated upstream
REM set GENERATOR="Visual Studio 14 2015 Win64"
set GENERATOR="NMake Makefiles"
=======
set GENERATOR="Visual Studio 14 2015 Win64"
REM set GENERATOR="NMake Makefiles"
>>>>>>> Stashed changes
set GENERATOR="Ninja"

set ORACLE_HOME=%CONDA_PREFIX%
cmake -G %GENERATOR% ^
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo ^
<<<<<<< Updated upstream
-DCMAKE_LIBRARY_PATH:FILEPATH="=%CONDA_PREFIX%/Library/lib" ^
=======
-DCMAKE_LIBRARY_PATH:FILEPATH="%CONDA_PREFIX%/Library/lib" ^
-DCMAKE_INCLUDE_PATH:FILEPATH="%CONDA_PREFIX%/Library/include" ^
-DLIBLZMA_LIBRARY:FILEPATH=%CONDA_PREFIX%\Library\lib\liblzma.lib ^
Expand All @@ -35,7 +24,6 @@ cmake -G %GENERATOR% ^
-DPython3_ROOT_DIR:FILEPATH="%CONDA_PREFIX%" ^
-DPython3_FIND_STRATEGY=LOCATION ^
-DPYTHON_EXECUTABLE="%CONDA_PREFIX%\python" ^
>>>>>>> Stashed changes
-DBUILD_PLUGIN_PYTHON=ON ^
-DPython3_ROOT_DIR:FILEPATH="%CONDA_PREFIX%" ^
-DPython3_FIND_STRATEGY=LOCATION ^
Expand All @@ -44,7 +32,7 @@ cmake -G %GENERATOR% ^
-DBUILD_PLUGIN_I3S=ON ^
-DBUILD_PLUGIN_E57=ON ^
-DBUILD_PLUGIN_TILEDB=ON ^
-DBUILD_PLUGIN_FBX=ON ^
-DBUILD_PLUGIN_FBX=OFF ^
-DBUILD_PLUGIN_ICEBRIDGE=ON ^
-DBUILD_PLUGIN_NITF=ON ^
-DBUILD_PLUGIN_TILEDB=ON ^
Expand All @@ -62,7 +50,7 @@ cmake -G %GENERATOR% ^
-DWITH_LZMA=ON ^
-DLIBLZMA_LIBRARY:FILEPATH=%CONDA_PREFIX%\Library\lib\liblzma.lib ^
-DZSTD_LIBRARY:FILEPATH=%CONDA_PREFIX%\Library\lib\libzstd.lib ^
-DBUILD_PLUGIN_RDBLIB=ON ^
-DBUILD_PLUGIN_RDBLIB=OFF ^
-DRdb_ROOT=..\..\..\..\rdblib-2.2.1-x86_64-windows\interface\cpp ^
.. --debug-trycompile

Expand Down

0 comments on commit 1e6b301

Please sign in to comment.