Skip to content

Commit

Permalink
Merge pull request #96 from Goddard-Fortran-Ecosystem/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
tclune authored Apr 17, 2023
2 parents 609f465 + a2e5396 commit 6dfb996
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 5 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# ------------------------------------------------------------------------ #
cmake_minimum_required (VERSION 3.12)
project (PFLOGGER
VERSION 1.9.5
VERSION 1.10.0
LANGUAGES Fortran)

set (CMAKE_MODULE_PATH
Expand All @@ -34,13 +34,13 @@ include (DefinePlatformDefaults)
set (CMAKE_POSITION_INDEPENDENT_CODE ON)

if (NOT TARGET GFTL::gftl)
find_package (GFTL REQUIRED VERSION 1.8.0)
find_package (GFTL REQUIRED VERSION 1.10.0)
endif ()
if (NOT TARGET GFTL_SHARED::gftl-shared)
find_package (GFTL_SHARED REQUIRED VERSION 1.5.0)
find_package (GFTL_SHARED REQUIRED VERSION 1.6.0)
endif ()
if (NOT TARGET YAFYAML::yafyaml)
find_package (YAFYAML REQUIRED VERSION 1.0.1)
find_package (YAFYAML REQUIRED VERSION 1.1.0)
endif ()

find_package (MPI QUIET)
Expand Down
13 changes: 12 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.10.0] - 2023-04-17

### Added

- Added `IntelLLVM.cmake` file as a copy of `Intel.cmake` to support the LLVM Intel compiler frontends

### Changed

- Updated required version of gFTL to v1.10.0
- Updated required version of gFTL-shared to v1.6.0
- Updated required version of yaFyaml to v1.1.0

## [1.9.5] - 2023-04-13

### Changed
Expand All @@ -33,7 +45,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

- Fixes for GNU Make builds
>>>>>>> main

## [1.9.1] - 2022-05-31

Expand Down
6 changes: 6 additions & 0 deletions cmake/IntelLLVM.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
set (FPP_FLAG "-cpp")
set (SUPPRESS_LINE_LENGTH_WARNING "-diag-disable 5268")
set (CMAKE_Fortran_FLAGS_RELEASE "${FPP_FLAG} -O3 -free -stand f08 ${SUPPRESS_LINE_LENGTH_WARNING}")
set (CMAKE_Fortran_FLAGS_DEBUG "${FPP_FLAG} -O0 -g -traceback \
-check uninit -free -stand f08 -save-temps ${SUPPRESS_LINE_LENGTH_WARNING}")

0 comments on commit 6dfb996

Please sign in to comment.