Merge branch 'develop' into hotfix/3.7.2

Author: iainrussell

bamboo/env.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-[[ $(uname) == "Darwin" ]] && return # no module environment on the Mac
+#[[ $(uname) == "Darwin" ]] && return # no module environment on the Mac
 
 # initialise module environment if it is not
-if [[ ! $(command -v module > /dev/null 2>&1) ]]; then
-  . /usr/local/apps/module/init/bash
-fi
+#if [[ ! $(command -v module > /dev/null 2>&1) ]]; then
+#  . /usr/local/apps/module/init/bash
+#fi
 
-module load cmake/new
+#module load cmake/new

cmake/VERSION

@@ -1 +1 @@
-3.7.1
+3.7.2

cmake/ecbuild_add_executable.cmake

@@ -21,6 +21,7 @@
 #                           [ OBJECTS <obj1> [<obj2> ...] ]
 #                           [ TEMPLATES <template1> [<template2> ...] ]
 #                           [ LIBS <library1> [<library2> ...] ]
+#                           [ NO_AS_NEEDED ]
 #                           [ INCLUDES <path1> [<path2> ...] ]
 #                           [ DEFINITIONS <definition1> [<definition2> ...] ]
 #                           [ PERSISTENT <file1> [<file2> ...] ]
@@ -62,6 +63,9 @@
 # LIBS : optional
 #   list of libraries to link against (CMake targets or external libraries)
 #
+# NO_AS_NEEDED: optional
+#   add --no-as-needed linker flag, to prevent stripping libraries that looks like are not used
+#
 # INCLUDES : optional
 #   list of paths to add to include directories
 #
@@ -137,7 +141,7 @@
 
 function( ecbuild_add_executable )
 
-  set( options NOINSTALL AUTO_VERSION )
+  set( options NOINSTALL AUTO_VERSION NO_AS_NEEDED )
   set( single_value_args TARGET COMPONENT LINKER_LANGUAGE VERSION OUTPUT_NAME )
   set( multi_value_args SOURCES SOURCES_GLOB SOURCES_EXCLUDE_REGEX OBJECTS
                         TEMPLATES LIBS INCLUDES DEPENDS PERSISTENT DEFINITIONS
@@ -238,7 +242,11 @@ function( ecbuild_add_executable )
       list(REMOVE_ITEM _PAR_LIBS debug)
       list(REMOVE_ITEM _PAR_LIBS optimized)
       ecbuild_filter_list(LIBS LIST ${_PAR_LIBS} LIST_INCLUDE lib LIST_EXCLUDE skipped_lib)
-      target_link_libraries( ${_PAR_TARGET} ${lib} )
+      if ( _PAR_NO_AS_NEEDED AND CMAKE_SYSTEM_NAME MATCHES "Linux" AND CMAKE_CXX_COMPILER_ID MATCHES "GNU" )
+        target_link_libraries( ${_PAR_TARGET} -Wl,--no-as-needed ${lib} )
+      else()
+        target_link_libraries( ${_PAR_TARGET} ${lib} )
+      endif()
       ecbuild_debug("ecbuild_add_executable(${_PAR_TARGET}): linking with [${lib}]")
       ecbuild_debug("ecbuild_add_executable(${_PAR_TARGET}): [${skipped_lib}] not found - not linking")
     endif()

cmake/ecbuild_add_test.cmake

@@ -27,6 +27,7 @@
 #                     [ OMP <number-of-threads-per-mpi-task> ]
 #                     [ ENABLED ON|OFF ]
 #                     [ LIBS <library1> [<library2> ...] ]
+#                     [ NO_AS_NEEDED ]
 #                     [ INCLUDES <path1> [<path2> ...] ]
 #                     [ DEFINITIONS <definition1> [<definition2> ...] ]
 #                     [ PERSISTENT <file1> [<file2> ...] ]
@@ -105,6 +106,9 @@
 # LIBS : optional
 #   list of libraries to link against (CMake targets or external libraries)
 #
+# NO_AS_NEEDED: optional
+#   add --no-as-needed linker flag, to prevent stripping libraries that looks like are not used
+#
 # INCLUDES : optional
 #   list of paths to add to include directories
 #
@@ -177,7 +181,7 @@
 
 function( ecbuild_add_test )
 
-  set( options           )
+  set( options           NO_AS_NEEDED )
   set( single_value_args TARGET ENABLED COMMAND TYPE LINKER_LANGUAGE MPI OMP WORKING_DIRECTORY )
   set( multi_value_args  SOURCES OBJECTS LIBS INCLUDES TEST_DEPENDS DEPENDS LABELS ARGS
                          PERSISTENT DEFINITIONS RESOURCES TEST_DATA CFLAGS
@@ -336,7 +340,11 @@ function( ecbuild_add_test )
         list(REMOVE_ITEM _PAR_LIBS optimized)
         ecbuild_filter_list(LIBS LIST ${_PAR_LIBS} LIST_INCLUDE lib LIST_EXCLUDE skipped_lib)
         ecbuild_debug("ecbuild_add_test(${_PAR_TARGET}): linking with [${lib}]")
-        target_link_libraries( ${_PAR_TARGET} ${lib} )
+        if ( _PAR_NO_AS_NEEDED AND CMAKE_SYSTEM_NAME MATCHES "Linux" AND CMAKE_CXX_COMPILER_ID MATCHES "GNU" )
+          target_link_libraries( ${_PAR_TARGET} -Wl,--no-as-needed ${lib} )
+        else()
+          target_link_libraries( ${_PAR_TARGET} ${lib} )
+        endif()
         ecbuild_debug("ecbuild_add_test(${_PAR_TARGET}): [${skipped_lib}] not found - not linking")
       endif()