Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
tclune authored Mar 6, 2024
2 parents f164724 + 9b84419 commit a5c1623
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 3 deletions.
6 changes: 3 additions & 3 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]


### Added

- Fujitsu compiler support

### Fixed

This fixes a small CMake bug which can lead to posix_predefined.x being built in the wrong build subdirectory when CMAKE_RUNTIME_OUTPUT_DIRECTORY is set*.
- This fixes a small CMake bug which can lead to posix_predefined.x being built in the wrong build subdirectory when CMAKE_RUNTIME_OUTPUT_DIRECTORY is set*.
- Missing implementation of `assertIsFinite_real80()`. Apparently undetected until recent attempt to port to flang.

### Changed

- Updated the CI to use Intel LLVM compilers
- Removed obsolete documentation

## [4.8.0] -2023-11-29
## [4.8.0] - 2023-11-29

### Changed

Expand Down
12 changes: 12 additions & 0 deletions src/funit/asserts/AssertBasic.F90
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,18 @@ subroutine assertIsFinite_real64(x, message, location)
end subroutine assertIsFinite_real64
#endif

#ifdef _REAL80_IEEE_SUPPORT
subroutine assertIsFinite_real80(x, message, location)
use, intrinsic :: ieee_arithmetic, only: ieee_is_finite
real(kind=REAL80), intent(in) :: x
character(len=*), optional, intent(in) :: message
type (SourceLocation), optional, intent(in) :: location

call assertTrue(ieee_is_finite(x), message, location)

end subroutine assertIsFinite_real80
#endif

#ifdef _REAL128_IEEE_SUPPORT
subroutine assertIsFinite_real128(x, message, location)
use, intrinsic :: ieee_arithmetic, only: ieee_is_finite
Expand Down
3 changes: 3 additions & 0 deletions src/funit/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ set(srcs
if (NOT SKIP_ROBUST)

add_executable(posix_predefined.x posix_predefined.c)
set_target_properties(posix_predefined.x PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
set_source_files_properties(posix_predefined.inc PROPERTIES GENERATED TRUE)
add_custom_command(
OUTPUT posix_predefined.inc
Expand Down

0 comments on commit a5c1623

Please sign in to comment.