Bump conda fmt spdlog versions and use the conda-forge packages

VITObelgium · Aug 29, 2024 · 6fc2ffb · 6fc2ffb
1 parent 579a28d
commit 6fc2ffb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 28 deletions.
diff --git a/conda/bld.bat b/conda/bld.bat
@@ -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
 
@@ -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 ^

diff --git a/conda/build.sh b/conda/build.sh
@@ -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
 

diff --git a/conda/templates/meta.yaml.jinja b/conda/templates/meta.yaml.jinja
@@ -12,6 +12,8 @@ requirements:
     - libgdal >=3.0
     - pybind11 >=2.5
     - eigen >=3.3
+    - fmt >=11.0
+    - spdlog >=1.14
   run:
     - python {{ '{{' }} python {{ '}}' }}
     - numpy