@@ -163,7 +163,7 @@ if(NOT DEFINED ENABLE_AEC AND NOT AEC_FOUND)
163163 "\n To force the build without it, use -DENABLE_AEC=OFF" )
164164endif ()
165165ecbuild_add_option( FEATURE AEC
166- DESCRIPTION "Support for Adaptive Entropy Coding"
166+ DESCRIPTION "Support for Adaptive Entropy Coding (WMO GRIB CCSDS) "
167167 DEFAULT ON
168168 CONDITION AEC_FOUND )
169169
@@ -219,7 +219,6 @@ ecbuild_add_option( FEATURE INSTALL_ECCODES_SAMPLES
219219
220220ecbuild_add_option( FEATURE MEMORY_MANAGEMENT DESCRIPTION "Enable memory management" DEFAULT OFF ADVANCED )
221221ecbuild_add_option( FEATURE ALIGN_MEMORY DESCRIPTION "Enable memory alignment" DEFAULT OFF ADVANCED )
222- ecbuild_add_option( FEATURE TIMER DESCRIPTION "Enable timer (deprecated)" DEFAULT OFF ADVANCED )
223222ecbuild_add_option( FEATURE ECCODES_THREADS DESCRIPTION "Enable thread-safety using POSIX threads" DEFAULT OFF ADVANCED )
224223ecbuild_add_option( FEATURE ECCODES_OMP_THREADS DESCRIPTION "Enable thread-safety using OpenMP threads" DEFAULT OFF ADVANCED )
225224ecbuild_add_option( FEATURE EXTRA_TESTS DESCRIPTION "Enable extended regression testing" DEFAULT OFF ADVANCED )
@@ -385,8 +384,9 @@ configure_file( eccodes_config.h.in eccodes_config.h )
385384
386385add_definitions ( -DHAVE_ECCODES_CONFIG_H )
387386
388- if ( CMAKE_COMPILER_IS_GNUCC )
387+ if ( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
389388 ecbuild_add_c_flags("-pedantic" )
389+ ecbuild_add_cxx_flags("-pedantic" )
390390endif ()
391391if ( CMAKE_CXX_COMPILER_ID MATCHES IntelLLVM )
392392 # Turn off -ffinite-math-only which gets included by some optimisation levels which assume values can never be NaN.
@@ -470,7 +470,7 @@ add_subdirectory( samples )
470470add_subdirectory ( ifs_samples ) # must come after samples
471471
472472# ecbuild_dont_pack( DIRS samples DONT_PACK_REGEX "*.grib" )
473- ecbuild_dont_pack( FILES .cproject .project )
473+ ecbuild_dont_pack( FILES .cproject .project eccodes.code-workspace )
474474ecbuild_dont_pack( DIRS
475475 experimental deprecated doxygen confluence tests/deprecated tests/tests.ecmwf
476476 src/eccodes/deprecated tools/deprecated ifs_samples/grib1_mlgrib2_ieee32
@@ -518,11 +518,11 @@ if( HAVE_FORTRAN )
518518endif ()
519519
520520###############################################################################
521- # Debugging aid. Print all known CMake variables
522- #get_cmake_property(_variableNames VARIABLES)
523- #foreach( _variableName ${_variableNames} )
521+ # Debugging aid. Print all known CMake variables:
522+ # get_cmake_property(_variableNames VARIABLES)
523+ # foreach( _variableName ${_variableNames} )
524524# ecbuild_info(" ${_variableName}=${${_variableName}}")
525- #endforeach()
525+ # endforeach()
526526###############################################################################
527527# finalize
528528
@@ -536,15 +536,6 @@ ecbuild_info(" | ecCodes version ${eccodes_VERSION} |")
536536ecbuild_info(" +--------------------------+" )
537537ecbuild_info("" )
538538
539- ecbuild_info("Please note:" )
540- ecbuild_info(" For Python3 support, you must install the Python bindings." )
541- ecbuild_info(" See:" )
539+ ecbuild_info("For further installation instructions, please see:" )
542540ecbuild_info(" https://confluence.ecmwf.int/display/ECC/ecCodes+installation" )
543541ecbuild_info("" )
544-
545- if ( HAVE_TIMER )
546- ecbuild_deprecate( "Option ENABLE_TIMER is ignored and will be removed in a future release." )
547- set ( ECCODES_TIMER 1 )
548- else ()
549- set ( ECCODES_TIMER 0 )
550- endif ()
0 commit comments