diff --git a/.gitattributes b/.gitattributes index 18f114a1..85ccb8f4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -24,4 +24,5 @@ bld.bat text eol=crlf /README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true +pixi.toml linguist-generated=true shippable.yml linguist-generated=true diff --git a/conda-forge.yml b/conda-forge.yml index 70718f1b..b0d88c51 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -8,10 +8,11 @@ bot: - 17.x build_platform: osx_arm64: osx_64 + win_arm64: win_64 +channel_priority: flexible conda_build: pkg_format: '2' conda_forge_output_validation: true -channel_priority: flexible github: branch_name: main tooling_branch_name: main diff --git a/recipe/bld.bat b/recipe/bld.bat index 4bdc5a1b..95b14757 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -13,7 +13,7 @@ if errorlevel 1 exit 1 set "CXXFLAGS=%CXXFLAGS% -Wno-c++98-compat" -cmake ^ +cmake %CMAKE_ARGS% ^ -G "Ninja" ^ -DCMAKE_BUILD_TYPE="%BUILD_CONFIG%" ^ -DCMAKE_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^