From e7c2da4968cfea97b8a16774d2f7c1bff8493f4d Mon Sep 17 00:00:00 2001 From: Dirk Vanden Boer Date: Mon, 18 Dec 2023 10:30:53 +0100 Subject: [PATCH] Specify the GSL cmake dir in the conda build --- conda/bld.bat | 5 +++-- conda/conda_build_config.yaml | 1 + deps/vcpkg | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/conda/bld.bat b/conda/bld.bat index 97dc675..ab90ee3 100644 --- a/conda/bld.bat +++ b/conda/bld.bat @@ -86,6 +86,7 @@ cmake ^ -Ddate_DIR="%SRC_DIR%\thirdparty\local\CMake" ^ -Dfmt_DIR:PATH="%SRC_DIR%\thirdparty\local\lib\cmake\fmt" ^ -Dspdlog_DIR:PATH="%SRC_DIR%\thirdparty\local\lib\cmake\spdlog" ^ + -DMicrosoft.GSL_DIR="%SRC_DIR%\thirdparty\local\share\cmake\Microsoft.GSL" ^ -DGDX_ENABLE_OPENMP=OFF ^ -DGDX_AVX2=OFF ^ -DGDX_ENABLE_SIMD=OFF ^ @@ -98,7 +99,7 @@ cmake ^ -DGDX_INSTALL_DEVELOPMENT_FILES=OFF ^ -DPython3_ROOT_DIR="%PREFIX%" ^ -DPython3_FIND_VIRTUALENV=ONLY ^ - --trace ^ - .. + --debug-find-pkg=Microsoft.GSL ^ + -S .. -B . if %ERRORLEVEL% NEQ 0 exit %ERRORLEVEL% cmake --build . --target install diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml index 890c1a6..9b03114 100644 --- a/conda/conda_build_config.yaml +++ b/conda/conda_build_config.yaml @@ -14,4 +14,5 @@ python: - 3.9 - 3.10 - 3.11 + - 3.12 \ No newline at end of file diff --git a/deps/vcpkg b/deps/vcpkg index 8ff56fb..fe5e04d 160000 --- a/deps/vcpkg +++ b/deps/vcpkg @@ -1 +1 @@ -Subproject commit 8ff56fb5baef0fb1f6dfea7bca641e77180e20d8 +Subproject commit fe5e04d6ffdddd1a550a665464f6757d1d79e1a8