Skip to content

Fixes for ifx 2025.2 support #500

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.

Sign up for GitHub

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

Merged
mathomp4 merged 2 commits into from
Sep 25, 2025
Merged

Fixes for ifx 2025.2 support #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2439c9f
Fixes for ifx 2025.2 support
mathomp4 Sep 22, 2025
60b6c94
Update CI for macos-15
mathomp4 Sep 22, 2025
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
11 changes: 8 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14]
compiler: [gfortran-12, gfortran-13, gfortran-14]
os: [ubuntu-22.04, ubuntu-24.04, macos-14, macos-15]
compiler: [gfortran-12, gfortran-13, gfortran-14, gfortran-15]
# gfortran-10 and -11 are only on ubuntu-22.04
# gfortran-13 and -14 are not on ubuntu-22.04
# gfortran-13, -14, and -15 are not on ubuntu-22.04
# gfortran-15 is only on macos
include:
- os: ubuntu-22.04
compiler: gfortran-10
Expand All @@ -34,6 +35,10 @@ jobs:
compiler: gfortran-13
- os: ubuntu-22.04
compiler: gfortran-14
- os: ubuntu-22.04
compiler: gfortran-15
- os: ubuntu-24.04
compiler: gfortran-15

# fail-fast if set to 'true' here is good for production, but when
# debugging, set to 'false'. fail-fast means if *any* ci test in the matrix fails
Expand Down
9 changes: 9 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- Alter CMake in `add_pfunit_test.cmake` and `add_pfunit_ctest.cmake` to workaround ifx 2025.2 preprocessor bug

### Changed

- Remove `macos-13` from CI, add `macos-15`
- Add `gfortran-15` for macOS CI

## [4.12.0] - 2025-04-07

### Changed
Expand Down
2 changes: 1 addition & 1 deletion include/add_pfunit_ctest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ function (add_pfunit_ctest test_package_name)
endif (${should_write_inc_file})
endif ()

target_compile_definitions (${test_package_name} PRIVATE -D_TEST_SUITES="${test_suite_inc_file}")
target_compile_definitions (${test_package_name} PRIVATE _TEST_SUITES=\<${test_suite_inc_file}\>)
target_include_directories (${test_package_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

if (PF_TEST_EXTRA_USE)
Expand Down
2 changes: 1 addition & 1 deletion include/add_pfunit_test.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function (add_pfunit_test test_package_name test_sources extra_sources extra_sou
target_include_directories (${test_package_name} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/include/${test_package_name})

# Define TestSuites
target_compile_definitions (${test_package_name} PRIVATE -D_TEST_SUITES="${TEST_SUITE_INC_FILE}")
target_compile_definitions (${test_package_name} PRIVATE _TEST_SUITES=\<${TEST_SUITE_INC_FILE}\>)

# Test utility preprocessing
set_property ( SOURCE ${PFUNIT_TESTUTILS}
Expand Down
Loading