Skip to content

Commit

Permalink
Merge branch 'hotfix/0.12.1'
Browse files Browse the repository at this point in the history
* hotfix/0.12.1:
  Version 0.12.1
  Revert "Compile fckit as static library with Cray compiler version 14 and up" from version 0.11.2
  Fix use of downstream fypp broken likely due to cmake 3.29
  • Loading branch information
wdeconinck committed Apr 15, 2024
2 parents f44d3f9 + 6604dfd commit 1c78eaa
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 14 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0.12.0
0.12.1

5 changes: 2 additions & 3 deletions cmake/fckit-import.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -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@
Expand Down
10 changes: 0 additions & 10 deletions src/fckit/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1c78eaa

Please sign in to comment.