From 6d22f494eacc8594eb7ccea84b6bf48ae583a9a8 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 3 Jan 2023 08:51:53 -0500 Subject: [PATCH 1/3] Add preliminary Intel LLVM Support --- ChangeLog.md | 4 ++++ cmake/IntelLLVM.cmake | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 cmake/IntelLLVM.cmake diff --git a/ChangeLog.md b/ChangeLog.md index 60fd822..6a68450 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -5,6 +5,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added + +- Added `IntelLLVM.cmake` file as a copy of `Intel.cmake` to support the LLVM Intel compiler frontends + ## [1.0.4] 2022-06-30 ### Fixed diff --git a/cmake/IntelLLVM.cmake b/cmake/IntelLLVM.cmake new file mode 100644 index 0000000..327fbdf --- /dev/null +++ b/cmake/IntelLLVM.cmake @@ -0,0 +1,23 @@ +# Compiler specific flags for Intel Fortran compiler + +if(WIN32) + set(no_optimize "-Od") + set(check_all "-check:all") +else() + set(no_optimize "-O0") + set(check_all "-check all") +endif() + + +set(disable_warning_for_long_names "-diag-disable 5462") +set(traceback "-traceback") +set(cpp "-cpp") + + +set(CMAKE_Fortran_FLAGS_DEBUG "${no_optimize}") +set(CMAKE_Fortran_FLAGS_RELEASE "-O3") +set(CMAKE_Fortran_FLAGS "-g ${cpp} ${traceback} ${check_all} ${disable_warning_for_long_names} -save-temps") +#set(CMAKE_Fortran_FLAGS "-g ${cpp} ${traceback} ${check_all} ${disable_warning_for_long_names}") + +add_definitions(-D_INTEL) +add_definitions(-D__ifort_18) From f3b5f9349270160b2d301b613167ef0d09a0d3b4 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 17 Apr 2023 10:38:53 -0400 Subject: [PATCH 2/3] Update CMakeLists and CHANGELOG for Release --- CMakeLists.txt | 2 +- ChangeLog.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 218feaa..05dc7b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.12) project (YAFYAML - VERSION 1.0.7 + VERSION 1.1.0 LANGUAGES Fortran) # Most users of this software do not (should not?) have permissions to diff --git a/ChangeLog.md b/ChangeLog.md index 6efdd99..f9dcb82 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -5,6 +5,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.1.0] - 2023-04-17 + ### Added - Added `IntelLLVM.cmake` file as a copy of `Intel.cmake` to support the LLVM Intel compiler frontends From 1dc97c888b105fd8dfd54b6a3d269f98381e9515 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 17 Apr 2023 10:45:52 -0400 Subject: [PATCH 3/3] Update required gFTL and gFTL-shared versions --- CMakeLists.txt | 4 ++-- ChangeLog.md | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 05dc7b1..0851776 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,11 +21,11 @@ endif() set(CMAKE_POSITION_INDEPENDENT_CODE ON) if (NOT TARGET GFTL::gftl) - find_package (GFTL REQUIRED VERSION 1.7.2) + find_package (GFTL REQUIRED VERSION 1.10.0) endif () if (NOT TARGET GFTL_SHARED::gftl-shared) - find_package (GFTL_SHARED REQUIRED VERSION 1.4.1) + find_package (GFTL_SHARED REQUIRED VERSION 1.6.0) endif () find_package (PFUNIT 4.2 QUIET) diff --git a/ChangeLog.md b/ChangeLog.md index f9dcb82..9c8a7b7 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added `IntelLLVM.cmake` file as a copy of `Intel.cmake` to support the LLVM Intel compiler frontends +### Changed + +- Updated required gFTL version to v1.10.0 +- Updated required gFTL-shared version to v1.6.0 + ## [1.0.7] - 2023-02-07 ### Fixed