From 8f390d09ba1073154d43ec6299949d551a327be4 Mon Sep 17 00:00:00 2001 From: Willem Deconinck Date: Tue, 9 Apr 2024 15:42:18 +0200 Subject: [PATCH 1/3] Fix use of downstream fypp broken likely due to cmake 3.29 --- cmake/fckit-import.cmake.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmake/fckit-import.cmake.in b/cmake/fckit-import.cmake.in index 800686c..72d5537 100644 --- a/cmake/fckit-import.cmake.in +++ b/cmake/fckit-import.cmake.in @@ -10,9 +10,8 @@ if( @PROJECT_NAME@_IS_BUILD_DIR_EXPORT ) set( FCTEST_GENERATOR @PYTHON_EXECUTABLE@ @CMAKE_CURRENT_SOURCE_DIR@/tools/fctest-generate-runner.py ) set( FYPP @CMAKE_CURRENT_SOURCE_DIR@/tools/fckit-eval.sh @PYTHON_EXECUTABLE@ @CMAKE_CURRENT_SOURCE_DIR@/tools/fckit-fypp.py ) else() - set( fckit_INSTALL_PREFIX ${PACKAGE_PREFIX_DIR} ) - set( FCTEST_GENERATOR @PYTHON_EXECUTABLE@ ${fckit_INSTALL_PREFIX}/libexec/fctest-generate-runner.py ) - set( FYPP ${fckit_INSTALL_PREFIX}/libexec/fckit-eval.sh @PYTHON_EXECUTABLE@ ${fckit_INSTALL_PREFIX}/libexec/fckit-fypp.py ) + set( FCTEST_GENERATOR @PYTHON_EXECUTABLE@ ${fckit_BASE_DIR}/libexec/fctest-generate-runner.py ) + set( FYPP ${fckit_BASE_DIR}/libexec/fckit-eval.sh @PYTHON_EXECUTABLE@ ${fckit_BASE_DIR}/libexec/fckit-fypp.py ) endif() @FCKIT_PREPROCESS_FYPP@ From 6ffee4ebc2a13a8603257300f8d1bc9996f69a16 Mon Sep 17 00:00:00 2001 From: Willem Deconinck Date: Mon, 15 Apr 2024 18:40:32 +0200 Subject: [PATCH 2/3] Revert "Compile fckit as static library with Cray compiler version 14 and up" from version 0.11.2 This reverts commit 48a181022611cb7ade796e1d6acfc5c5abfc6b94. It seems that for Cray compiler version 14 and up in the context of IFS, we need to compile dynamic library with -fuse-ld=bfd --- src/fckit/CMakeLists.txt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/fckit/CMakeLists.txt b/src/fckit/CMakeLists.txt index e66c9ef..e00ce99 100644 --- a/src/fckit/CMakeLists.txt +++ b/src/fckit/CMakeLists.txt @@ -68,16 +68,6 @@ if( CMAKE_Fortran_COMPILER_ID MATCHES "PGI|NVHPC" ) set_source_files_properties( module/fckit_array.F90 PROPERTIES COMPILE_FLAGS "-w" ) endif() -if( CMAKE_Fortran_COMPILER_ID MATCHES "Cray" ) - # Problem with type-bound procedures requires fckit static compilation or -fuse-ld=bfd linking flag - # Problem is tracked with LUMI #3011 support ticket and https://jira.ecmwf.int/browse/DE-927 - # Bug present with cce/14 cce/15 cce/16 cce/17 (versions greater not tested) - if( ${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 14 ) - ecbuild_warn( "Bug in cray < 14 requires fckit to be compiled statically" ) - set( fckit_type STATIC ) - endif() -endif() - ecbuild_add_library( TARGET fckit From 6604dfd21860c8f5bbc7f6a0f2454dd386b55f9a Mon Sep 17 00:00:00 2001 From: Willem Deconinck Date: Mon, 15 Apr 2024 18:42:58 +0200 Subject: [PATCH 3/3] Version 0.12.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 705a1dc..c824a54 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -0.12.0 +0.12.1