Merge branch 'release/0.7.0'

* release/0.7.0:
  FCKIT-25 Workaround PGI compiler bug in test
  FCKIT-24 Port to ecbuild3
  Cosmetic internal change: Rename JSON to YAML
  FCKIT-22 Fix fckit_test_shared_ptr on Cray by avoiding a SEGV due to compiler bug
  FCKIT-21 Workaround GCC internal compiler bug
  FCKIT-20 Access MPI_INFO_NULL

Author: wdeconinck

CMakeLists.txt

@@ -10,27 +10,20 @@
 # FCKIT
 
 cmake_minimum_required( VERSION 3.6 FATAL_ERROR )
+if( POLICY CMP0074 )
+  cmake_policy( SET CMP0074 NEW )
+  # This policy allows to search for packages with <package>_ROOT variables
+  #                        (only supported with CMake 3.12 and above)
+  # This policy can be removed once cmake_minimum_required( VERSION 3.12 ) is used
+endif()
 
-set( ENABLE_OS_TESTS            OFF   CACHE BOOL " " )
-set( ENABLE_LARGE_FILE_SUPPORT  OFF   CACHE BOOL " " )
-
-project( fckit C CXX Fortran )
-
-set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild/cmake")
-set( ECBUILD_DEFAULT_BUILD_TYPE Release )
-
-include( ecbuild_system NO_POLICY_SCOPE )
+find_package( ecbuild 3.0.0 REQUIRED )
 
-ecbuild_requires_macro_version( 2.7 )
+project( fckit LANGUAGES C CXX Fortran )
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-################################################################################################
-# project
-
-ecbuild_declare_project()
-
 ################################################################################################
 # options & dependencies
 
@@ -43,18 +36,21 @@ ecbuild_check_fortran( FEATURES finalization )
 
 set( FEATURE_FINAL_DEFAULT ON )
 if( CMAKE_Fortran_COMPILER_ID MATCHES "PGI" )
-  # Compilation works, but runtime segmentation faults occur (tested with pgi/17.7)
-  set( FEATURE_FINAL_DEFAULT OFF )
+  if( ${CMAKE_Fortran_COMPILER_VERSION} VERSION_LESS 19.10 )
+    # Compilation works, but runtime segmentation faults occur (tested with pgi/17.7)
+    set( FEATURE_FINAL_DEFAULT OFF )
+  else()
+    list( APPEND FCKIT_QUARANTAINED_TESTS fckit_test_shared_ptr )
+    # deallocation of list of shared_ptr only seems to deallocate first entry
+  endif()
 endif()
 
 ecbuild_add_option( FEATURE FINAL
                     DESCRIPTION "Enable automatic finalisation for derived types (destructors)"
                     DEFAULT ${FEATURE_FINAL_DEFAULT}
                     CONDITION EC_HAVE_Fortran_FINALIZATION )
 
-set( FCKIT_HAVE_FINAL 0 )
-if( ENABLE_FINAL )
-    set( FCKIT_HAVE_FINAL 1 )
+if( fckit_HAVE_FINAL )
     include( final-support )
     check_final_support()
     ecbuild_info( "FCKIT_HAVE_FINAL [1]")
@@ -67,8 +63,8 @@ if( ENABLE_FINAL )
     ecbuild_info( "  FCKIT_FINAL_BROKEN_FOR_ALLOCATABLE_ARRAY = ${FCKIT_FINAL_BROKEN_FOR_ALLOCATABLE_ARRAY}")
     ecbuild_info( "  FCKIT_FINAL_BROKEN_FOR_AUTOMATIC_ARRAY   = ${FCKIT_FINAL_BROKEN_FOR_AUTOMATIC_ARRAY}")
 endif()
-if( NOT FCKIT_HAVE_FINAL )
-    ecbuild_info( "FCKIT_HAVE_FINAL [0]")
+if( NOT fckit_HAVE_FINAL )
+    ecbuild_info( "fckit_HAVE_FINAL [0]")
     set( FCKIT_FINAL_FUNCTION_RESULT              0 )
     set( FCKIT_FINAL_UNINITIALIZED_LOCAL          0 )
     set( FCKIT_FINAL_UNINITIALIZED_INTENT_OUT     0 )
@@ -79,19 +75,33 @@ if( NOT FCKIT_HAVE_FINAL )
     set( FCKIT_FINAL_BROKEN_FOR_AUTOMATIC_ARRAY   0 )
 endif()
 
+ecbuild_find_package( NAME eckit VERSION 0.21.0 QUIET )
 ecbuild_add_option( FEATURE ECKIT
                     DESCRIPTION "Wrap ecKit functionality"
-                    REQUIRED_PACKAGES "PROJECT eckit VERSION 0.21.0" )
-
-ecbuild_add_cxx11_flags()
+                    CONDITION eckit_FOUND )
+if( NOT fckit_HAVE_ECKIT )
+    ecbuild_warn("ecKit could not be found. This disables various fckit features such as MPI, Configuration, Logging")
+endif()
 
-if( HAVE_ECKIT AND NOT ECKIT_HAVE_MPI )
+## MPI
+set( fckit_HAVE_ECKIT_MPI_PARALLEL 0 )
+if( fckit_HAVE_ECKIT )
+  if( NOT ECKIT_HAVE_MPI )
+    set( fckit_HAVE_ECKIT_MPI_PARALLEL 0 )
+    set( HAVE_MPI 0 )
+  else()
+    set( fckit_HAVE_ECKIT_MPI_PARALLEL 1 )
+    set( HAVE_MPI 1 )
+  endif()
+endif()
+set( fckit_HAVE_MPI ${HAVE_MPI} )
+if( fckit_HAVE_ECKIT AND NOT fckit_HAVE_MPI )
   ecbuild_warn("ecKit has been compiled without MPI. This causes fckit to not be able to run parallel executables.")
 endif()
 
-if( ECKIT_VERSION VERSION_LESS "0.25" )
+if( eckit_VERSION VERSION_LESS "0.25" )
   set( ECKIT_IMPROVED_MPI 0 )
-  if( HAVE_ECKIT )
+  if( fckit_HAVE_ECKIT )
     ecbuild_warn( "eckit version does not allow support for" 
                   "- fckit_mpi_comm%set_default()"
                   "- fckit_mpi_comm%name()"
@@ -104,10 +114,6 @@ endif()
 ################################################################################################
 # export package info
 
-list( APPEND FCKIT_INCLUDE_DIRS
-    ${CMAKE_CURRENT_SOURCE_DIR}/src
-    ${CMAKE_CURRENT_BINARY_DIR}/src
-    ${CMAKE_Fortran_MODULE_DIRECTORY})
 set( FCKIT_LIBRARIES  fckit )
 
 ################################################################################################
@@ -118,7 +124,6 @@ set( FCTEST_GENERATOR ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tools/fct
 include( fckit_preprocess_fypp )
 include( add_fctest )
 
-set( HAVE_FCTEST 1)
 add_subdirectory( src )
 add_subdirectory( doc )
 

VERSION

@@ -0,0 +1 @@
+0.7.0

VERSION.cmake

@@ -0,0 +1 @@
+#set( ECBUILD_2_COMPAT OFF CACHE BOOL "Disable ecbuild 2 compat mode for bamboo testing" )

bamboo/flags.cmake

@@ -190,7 +190,7 @@ function( fckit_target_preprocess_fypp _PAR_TARGET )
         set( source_files_properties ${source} PROPERTIES HEADER_FILE_ONLY TRUE )
       endforeach()
 
-### BUG WORKAROUND (tested upto 3.13.2)
+### BUG WORKAROUND (tested upto CMake 3.13.2)
 #   Even though source files to be preprocessed with final extension .F90 have just been
 #   declared as HEADER_FILE_ONLY, CMake still tries to compile these files.
 #   This does not happen for files ending with other extensions ( .fypp )

cmake/fckit_preprocess_fypp.cmake

@@ -6,10 +6,11 @@
 # granted to it by virtue of its status as an intergovernmental organisation nor
 # does it submit to any jurisdiction.
 
+find_package(FORD QUIET)
 ecbuild_add_option(
   FEATURE DOCS
   DESCRIPTION "Generate reference documentation"
-  REQUIRED_PACKAGES "FORD QUIET" )
+  CONDITION FORD_FOUND )
 
 if( HAVE_DOCS )
 
@@ -27,7 +28,7 @@ if( HAVE_DOCS )
   list( APPEND FORD_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FORDFILE}.in ${CMAKE_CURRENT_SOURCE_DIR}/${FORDPREPROCESSOR}.in )
 
   add_custom_command(OUTPUT "ford/index.html"
-  	COMMAND ${FORD_EXECUTABLE} --debug "${CMAKE_CURRENT_BINARY_DIR}/${FORDFILE}"
+    COMMAND ${FORD_EXECUTABLE} --debug "${CMAKE_CURRENT_BINARY_DIR}/${FORDFILE}"
     WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
     DEPENDS ${FORD_DEPENDS}
     COMMENT "Building HTML documentation for ${CMAKE_PROJECT_NAME} using FORD (${CMAKE_CURRENT_BINARY_DIR}/ford/index.html)" )

doc/CMakeLists.txt

@@ -6,7 +6,15 @@
 # granted to it by virtue of its status as an intergovernmental organisation nor
 # does it submit to any jurisdiction.
 
-if( HAVE_FCTEST )
+cmake_minimum_required( VERSION 3.6 FATAL_ERROR )
+
+find_package( ecbuild 3.0.0 REQUIRED )
+
+project( fctest_examples VERSION 0.0.0 LANGUAGES Fortran )
+
+ecbuild_enable_fortran( REQUIRED MODULE_DIRECTORY ${PROJECT_BINARY_DIR}/module )
+
+find_package( fckit REQUIRED )
 
 ecbuild_add_library( TARGET fctest_example_lib
                      SOURCES fctest_example_lib.F90
@@ -19,7 +27,5 @@ add_fctest( TARGET fctest_example_simple
 
 add_fctest( TARGET fctest_example_with_fixture
             LINKER_LANGUAGE Fortran
-            SOURCES fctest_example_with_fixture.F90
-           )
+            SOURCES fctest_example_with_fixture.F90 )
 
-endif()

src/fctest_examples/CMakeLists.txt doc/fctest_examples/CMakeLists.txt

@@ -1,7 +1,7 @@
 project: fcKit
 project_website: https://software.ecmwf.int/wiki/display/FCKIT
 project_github: https://github.com/ecmwf/fckit
-version: @FCKIT_VERSION@
+version: @fckit_VERSION@
 summary: Fortran support library
 author: ECMWF
 author_website: www.ecmwf.int

src/fctest_examples/fctest_example_lib.F90 doc/fctest_examples/fctest_example_lib.F90

@@ -6,8 +6,7 @@
 # granted to it by virtue of its status as an intergovernmental organisation nor
 # does it submit to any jurisdiction.
 
-if( @PNAME@_IS_BUILD_DIR_EXPORT OR @PROJECT_NAME@_IS_BUILD_DIR_EXPORT )
-  # @PNAME@_IS_BUILD_DIR is not defined when ECBUILD_2_COMPAT=OFF
+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()
@@ -20,9 +19,18 @@ endif()
 
 @ADD_FCTEST@
 
-# Required when "ECBUILD_2_COMPAT=OFF" and static linking is used
 set( fckit_HAVE_ECKIT @fckit_HAVE_ECKIT@ )
-if( fckit_HAVE_ECKIT)
+set( fckit_ECKIT_FOUND 0 )
+if( fckit_HAVE_ECKIT )
+  set( fckit_ECKIT_FOUND 1 )
+
+  # Following Required when "ECBUILD_2_COMPAT=OFF" and static linking is used
   include( CMakeFindDependencyMacro )
-  find_dependency( eckit HINTS ${CMAKE_CURRENT_LIST_DIR}/../eckit @eckit_DIR@ )
+  find_dependency( eckit HINTS ${CMAKE_CURRENT_LIST_DIR}/../eckit @eckit_DIR@ @eckit_BINARY_DIR@ )
+endif()
+
+if( fckit_FIND_REQUIRED_ECKIT AND NOT fckit_ECKIT_FOUND )
+  message( FATAL_ERROR "fckit was not compiled with ECKIT enabled" )
 endif()
+
+set( FCKIT_LIBRARIES @FCKIT_LIBRARIES@ )

src/fctest_examples/fctest_example_simple.F90 doc/fctest_examples/fctest_example_simple.F90

@@ -8,9 +8,8 @@
 
 add_subdirectory(fckit)
 add_subdirectory(apps)
-add_subdirectory(fctest_examples)
 add_subdirectory(tests)
 
-if ( ENABLE_SANDBOX )
+if ( HAVE_SANDBOX )
   add_subdirectory(sandbox)
 endif()

src/fctest_examples/fctest_example_with_fixture.F90 doc/fctest_examples/fctest_example_with_fixture.F90

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
-FCKIT_VERSION_STR="@FCKIT_VERSION_STR@"
-FCKIT_VERSION="@FCKIT_VERSION@"
+FCKIT_VERSION_STR="@fckit_VERSION_STR@"
+FCKIT_VERSION="@fckit_VERSION@"
 
-FCKIT_MAJOR_VERSION=@FCKIT_MAJOR_VERSION@
-FCKIT_MINOR_VERSION=@FCKIT_MINOR_VERSION@
-FCKIT_PATCH_VERSION=@FCKIT_PATCH_VERSION@
+FCKIT_MAJOR_VERSION=@fckit_VERSION_MAJOR@
+FCKIT_MINOR_VERSION=@fckit_VERSION_MINOR@
+FCKIT_PATCH_VERSION=@fckit_VERSION_PATCH@
 
-FCKIT_GIT_SHA1="@FCKIT_GIT_SHA1@"
+FCKIT_GIT_SHA1="@fckit_GIT_SHA1@"
 
 #################################################################
 # Commands
@@ -21,7 +21,7 @@ usage()
 
 version()
 {
-  echo "${FCKIT_VERSION}"
+  echo "${fckit_VERSION}"
 }
 
 print_feature()
@@ -38,7 +38,7 @@ print_feature()
 
 info()
 {
-  echo "fckit version (${FCKIT_VERSION}), git-sha1 ${FCKIT_GIT_SHA1}"
+  echo "fckit version (${fckit_VERSION}), git-sha1 ${fckit_GIT_SHA1}"
   echo ""
   echo "Build:"
   echo "  build type      : @CMAKE_BUILD_TYPE@"
@@ -52,21 +52,21 @@ info()
   echo "    flags         : @EC_Fortran_FLAGS@"
   echo ""
   echo "Features:"
-  echo "  MPI             : $(print_feature @ECKIT_HAVE_MPI@)"
-  echo "  final           : $(print_feature @FCKIT_HAVE_FINAL@)"
-  echo "  eckit           : $(print_feature @FCKIT_HAVE_ECKIT@)"
+  echo "  MPI             : $(print_feature @eckit_HAVE_MPI@)"
+  echo "  final           : $(print_feature @fckit_HAVE_FINAL@)"
+  echo "  eckit           : $(print_feature @fckit_HAVE_ECKIT@)"
   echo ""
   echo "Dependencies: "
-  if [ -n "@FCKIT_HAVE_ECKIT@" ]; then
-  echo "  eckit version (@ECKIT_VERSION@), git-sha1 $(short_gitsha1 @ECKIT_GIT_SHA1@)"
+  if [ -n "@fckit_HAVE_ECKIT@" ]; then
+  echo "  eckit version (@eckit_VERSION@), git-sha1 $(short_gitsha1 @eckit_GIT_SHA1@)"
   else
   echo "  None"
   fi
 }
 
 gitsha1()
 {
-  echo "${FCKIT_GIT_SHA1}"
+  echo "${fckit_GIT_SHA1}"
 }
 
 short_gitsha1()