Skip to content

Commit

Permalink
trying again
Browse files Browse the repository at this point in the history
Signed-off-by: Nick Papior <[email protected]>
  • Loading branch information
zerothi committed Sep 19, 2023
1 parent cdcf106 commit 7c31141
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/wheels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,15 @@ jobs:

# Setup the fortran compiler. This is aware of the operating system.
- uses: awvwgk/setup-fortran@main
id: setup-fortran
if: runner.os != 'Windows'
id: sf
with:
compiler: gcc
version: 11

- uses: msys2/setup-msys2@v2
if: runner.os == 'Windows'

- name: Compiler checker
if: runner.os != 'Windows'
run: |
Expand All @@ -61,16 +65,11 @@ jobs:
name: FFLAGS
value: $FFLAGS $ARCHFLAGS

- name: Fixing cmake arguments
uses: myci-actions/export-env-var@1
with:
name: SKBUILD_CMAKE_ARGS
value: -DCMAKE_Fortran_COMPILER=$FC;-DCMAKE_C_COMPILER=$CC

# We use the cibuildwheel action to take care of everything
- name: Build wheels
uses: pypa/[email protected]
env:
#SKBUILD_CMAKE_ARGS: -DCMAKE_Fortran_COMPILER=${{ steps.sf.outputs.fc }};-DCMAKE_C_COMPILER=${{ steps.sf.outputs.cc }}
CC: ${{ steps.setup-fortran.outputs.cc }}
FC: ${{ steps.setup-fortran.outputs.fc }}

Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ cmake_print_variables(CMAKE_CXX_FLAGS)
if(WITH_FORTRAN)
cmake_print_variables(CMAKE_Fortran_FLAGS)
endif()
set(ARCHFLAGS $ENV{ARCHFLAGS})
cmake_print_variables(ARCHFLAGS)

list(POP_BACK CMAKE_MESSAGE_INDENT)

Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ build-verbosity = 3
test-extras = "test"

skip = [
"pp*",
"cp312-*",
]

Expand All @@ -310,6 +311,7 @@ test-command = "bash {project}/tools/build_tools/test_wheel.sh {project}"
[tool.cibuildwheel.linux]
archs = ["x86_64", "aarch64"]


[tool.cibuildwheel.windows]
archs = ["AMD64", "x86"]

Expand Down
2 changes: 1 addition & 1 deletion src/sisl/io/siesta/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ set_source_files_properties("${name}"
)

# Additional sources which we do not need interfaces
# too in the Python front
# to in the Python front
set(siesta_sources
sparse_io
)
Expand Down

0 comments on commit 7c31141

Please sign in to comment.