Skip to content

Commit

Permalink
Fix dll exclusions (2) (#880)
Browse files Browse the repository at this point in the history
* Try different regexes.

* Don't think these onecore things were there before.

* Switch order, looks odd the other way round.

* Try this.

* Better regex?

* Try simplest.

* Requiring cmake 3.21 anyway.

* Fix.

* Manual addition, see it does anything

* Try stuff from recent thread.

* Fix syntax.

* Use system cmake vs wheel.

* Wrong command to disable pypi cmake download.

* Build broken on Windows using CMake >= 3.31

* Parses from here.

* Output cmake version.

* Try installing old cmake version.

* Fix syntax

* Tidy up.
  • Loading branch information
jhale authored Nov 18, 2024
1 parent 230d110 commit d2361fb
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
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

0 comments on commit d2361fb

Please sign in to comment.