Skip to content

Commit

Permalink
Bump conda fmt spdlog versions and use the conda-forge packages
Browse files Browse the repository at this point in the history
  • Loading branch information
dirkvdb committed Aug 29, 2024
1 parent 579a28d commit 6fc2ffb
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 28 deletions.
26 changes: 0 additions & 26 deletions conda/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ mkdir %SRC_DIR%\thirdparty

cd %SRC_DIR%\thirdparty

git clone --branch 10.2.1 --depth 1 https://github.com/fmtlib/fmt.git
git clone --branch v1.13.0 --depth 1 https://github.com/gabime/spdlog.git
git clone --branch v4.0.0 --depth 1 https://github.com/Microsoft/GSL.git
git clone --branch v3.0.1 --depth 1 https://github.com/HowardHinnant/date

Expand All @@ -28,30 +26,6 @@ if %ERRORLEVEL% NEQ 0 exit %ERRORLEVEL%
cmake --build . --target install
if %ERRORLEVEL% NEQ 0 exit %ERRORLEVEL%

cd %SRC_DIR%/thirdparty/fmt
cmake -G Ninja ^
-DCMAKE_BUILD_TYPE=Release ^
-DFMT_TEST=OFF ^
-DFMT_DOC=OFF ^
-DCMAKE_INSTALL_PREFIX=../local ^
-S . -B .
if %ERRORLEVEL% NEQ 0 exit %ERRORLEVEL%
cmake --build . --target install
if %ERRORLEVEL% NEQ 0 exit %ERRORLEVEL%

cd %SRC_DIR%/thirdparty/spdlog
cmake -G Ninja ^
-DCMAKE_BUILD_TYPE=Release ^
-DSPDLOG_BUILD_BENCH=OFF ^
-DSPDLOG_BUILD_EXAMPLE=OFF ^
-DSPDLOG_BUILD_TESTS=OFF ^
-DSPDLOG_FMT_EXTERNAL=ON ^
-DCMAKE_INSTALL_PREFIX=../local ^
-S . -B .
if %ERRORLEVEL% NEQ 0 exit %ERRORLEVEL%
cmake --build . --target install
if %ERRORLEVEL% NEQ 0 exit %ERRORLEVEL%

cd %SRC_DIR%/thirdparty/GSL
cmake -G Ninja ^
-DCMAKE_BUILD_TYPE=Release ^
Expand Down
2 changes: 0 additions & 2 deletions conda/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ mkdir -p ${SRC_DIR}/thirdparty/local/share/cmake

cd ${SRC_DIR}/thirdparty

git clone --branch 9.1.0 --depth 1 https://github.com/fmtlib/fmt.git
git clone --branch v1.10.0 --depth 1 https://github.com/gabime/spdlog.git
git clone --branch v4.0.0 --depth 1 https://github.com/Microsoft/GSL.git
git clone --branch v3.0.1 --depth 1 https://github.com/HowardHinnant/date

Expand Down
2 changes: 2 additions & 0 deletions conda/templates/meta.yaml.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ requirements:
- libgdal >=3.0
- pybind11 >=2.5
- eigen >=3.3
- fmt >=11.0
- spdlog >=1.14
run:
- python {{ '{{' }} python {{ '}}' }}
- numpy
Expand Down

0 comments on commit 6fc2ffb

Please sign in to comment.