Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dll exclusions (2) #880

Merged
merged 22 commits into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ jobs:
with:
python-version: "3.11"

- name: Set up CMake
uses: lukka/get-cmake@latest
with:
cmakeVersion: "~3.30.0"

- name: Install Basix (combined)
run: |
python -m pip -v install --no-cache-dir .[ci] --config-settings=cmake.args=-DINSTALL_RUNTIME_DEPENDENCIES=ON --config-settings=cmake.args=-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
Expand All @@ -54,7 +59,7 @@ jobs:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
steps:
- uses: actions/checkout@v4

- name: Insert add_dll_directory calls
working-directory: python/basix
run: |
Expand All @@ -73,6 +78,11 @@ jobs:
with:
python-version: "3.12"

- name: Set up CMake
uses: lukka/get-cmake@latest
with:
cmakeVersion: "~3.30.0"

- name: Install Basix (C++)
run: |
cd cpp
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.21...3.30)
cmake_minimum_required(VERSION 3.21)

project(BasixFull VERSION "0.10.0.0" LANGUAGES CXX)
set(BASIX_FULL_SKBUILD TRUE)
Expand Down
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.21...3.30)
cmake_minimum_required(VERSION 3.21)

# Set the version
project(Basix VERSION "0.10.0.0" LANGUAGES CXX)
Expand Down