From 63a6d347b78e170a699193f85c5b5a2cffcb8458 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 20 Oct 2014 17:40:17 +0100
Subject: [PATCH] GRIB-611: rework options to use ecbuild_add_option

---
 CMakeLists.txt                               | 97 ++++++++++----------
 grib_api_config.h.in                         |  2 +-
 src/grib_accessor_class_data_ccsds_packing.c |  2 +-
 3 files changed, 49 insertions(+), 52 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 549971e2e..04b0d8d83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,23 +29,60 @@ ecbuild_declare_project()
 ###############################################################################
 # some variables/options of this project
 
-option( ENABLE_JPG     "try to add support for JPG encoding"          ON )
-option( ENABLE_PNG     "try to add support for PNG encoding"          OFF )
-option( ENABLE_NETCDF  "try to add support for NetCDF"                ON )
-option( ENABLE_AEC     "try to add support for Adaptive Entropy Coding" OFF )
-option( ENABLE_PYTHON  "try to build the GRIB_API Python interface"   ON )
-option( ENABLE_FORTRAN "try to build the GRIB_API Fortran interface"  ON )
+ecbuild_add_option( FEATURE JPG
+	DESCRIPTION "support for JPG encoding"
+	DEFAULT ON
+)
+
+ecbuild_add_option( FEATURE PNG
+	DESCRIPTION "support for PNG encoding"
+	DEFAULT OFF
+	REQUIRED_PACKAGES PNG
+)
+
+if( HAVE_PNG )
+	set( HAVE_LIBPNG 1 ) # compatibility with autotools
+	add_definitions( ${PNG_DEFINITIONS} )
+else()
+	set( HAVE_LIBPNG 0 )
+endif()
+
+ecbuild_add_option( FEATURE NETCDF
+	DESCRIPTION "support for NetCDF"
+	DEFAULT ON
+	REQUIRED_PACKAGES NetCDF
+)
+
+ecbuild_add_option( FEATURE AEC
+	DESCRIPTION "support for Adaptive Entropy Coding"
+	DEFAULT OFF
+	REQUIRED_PACKAGES AEC
+)
+
+ecbuild_add_option( FEATURE PYTHON
+	DESCRIPTION "build the GRIB_API Python interface"
+	DEFAULT ON
+)
+
+ecbuild_add_option( FEATURE FORTRAN
+	DESCRIPTION "build the GRIB_API Fortran interface"
+	DEFAULT ON
+)
+
 
 if( ENABLE_FORTRAN )
     # will set EC_HAVE_FORTRAN with the result
     ecbuild_enable_fortran( MODULE_DIRECTORY ${PROJECT_BINARY_DIR}/fortran/modules )
+	set( HAVE_FORTRAN ${EC_HAVE_FORTRAN} )
 endif()
 
-option( ENABLE_MEMORY_MANAGEMENT "enable memory management"  OFF )
-option( ENABLE_ALIGN_MEMORY      "enable memory alignment"   OFF )
+# advanced options (not visible in cmake-gui )
 
-option( GRIB_TIMER       "enable timer"    OFF )
-option( GRIB_THREADS     "enable threads"  OFF )
+ecbuild_add_option( FEATURE MEMORY_MANAGEMENT DESCRIPTION "enable memory management" DEFAULT OFF ADVANCED )
+ecbuild_add_option( FEATURE ALIGN_MEMORY      DESCRIPTION "enable memory alignment"  DEFAULT OFF ADVANCED )
+
+ecbuild_add_option( FEATURE GRIB_TIMER       DESCRIPTION "enable timer"   DEFAULT OFF ADVANCED )
+ecbuild_add_option( FEATURE GRIB_THREADS     DESCRIPTION "enable threads" DEFAULT OFF ADVANCED )
 
 ###############################################################################
 # macro processing
@@ -56,18 +93,6 @@ set( GRIB_API_EXTRA_DEFINITIONS  "" )
 
 find_package( CMath )
 
-### AEC support (Adaptive Entropy Coding)
-
-set( HAVE_LIBAEC 0 )
-if( ENABLE_AEC )
-
-    find_package( AEC )
-
-    if( AEC_FOUND )
-        set( HAVE_LIBAEC 1 )
-    endif()
-endif()
-
 ### JPG support
 
 set( HAVE_JPEG 0 )
@@ -93,34 +118,6 @@ if( ENABLE_JPG )
 
 endif()
 
-### PNG support
-
-set( HAVE_LIBPNG 0 )
-
-if( ENABLE_PNG )
-
-  find_package( PNG )
-
-  if( PNG_FOUND )
-        set( HAVE_LIBPNG 1 )
-        add_definitions( ${PNG_DEFINITIONS} )
-  endif()
-
-endif()
-
-### NetCDF support
-
-set( HAVE_NETCDF 0 )
-
-if( ENABLE_NETCDF )
-
-  find_package( NetCDF )
-
-  if( NETCDF_FOUND )
-        set( HAVE_NETCDF 1 )
-  endif()
-
-endif()
 
 ###############################################################################
 # other options
diff --git a/grib_api_config.h.in b/grib_api_config.h.in
index 80dea1e73..5e8862b1d 100644
--- a/grib_api_config.h.in
+++ b/grib_api_config.h.in
@@ -93,7 +93,7 @@
 
 #define HAVE_LIBPNG  @HAVE_LIBPNG@
 
-#cmakedefine HAVE_LIBAEC
+#cmakedefine HAVE_AEC
 
 #cmakedefine HAVE_NETCDF
 
diff --git a/src/grib_accessor_class_data_ccsds_packing.c b/src/grib_accessor_class_data_ccsds_packing.c
index 3615acb1d..484f3190a 100644
--- a/src/grib_accessor_class_data_ccsds_packing.c
+++ b/src/grib_accessor_class_data_ccsds_packing.c
@@ -180,7 +180,7 @@ static int value_count(grib_accessor* a, long* count)
     return grib_get_long_internal(a->parent->h,self->number_of_values,count);
 }
 
-#ifdef HAVE_LIBAEC
+#if defined (HAVE_LIBAEC) || defined(HAVE_AEC)
 
 #include <libaec.h>