fixed option (#539)

* fixed option

* fixed comment

* turned off g2c testing for intel and windows

.github/workflows/Intel.yml

@@ -45,7 +45,7 @@ jobs:
 
     - name: build
       run: |
-        cmake -S g2c -B g2c/build -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper
+        cmake -S g2c -B g2c/build -DJasper_ROOT=$GITHUB_WORKSPACE/nceplibs/jasper -DBUILD_G2C=OFF
         cmake --build g2c/build --parallel 2 --verbose
 
     - name: Perform CodeQL Analysis

.github/workflows/windows.yml

@@ -48,7 +48,7 @@ jobs:
         mkdir build
         cd build
         # Windows CI fails when building with shared libs, turn off
-        cmake -DUSE_OpenJPEG=ON -DUSE_Jasper=OFF -DBUILD_SHARED_LIBS=OFF -DLOGGING=ON -DUSE_AEC=ON ..
+        cmake -DUSE_OpenJPEG=ON -DUSE_Jasper=OFF -DBUILD_SHARED_LIBS=OFF -DLOGGING=ON -DUSE_AEC=ON  -DBUILD_G2C=OFF ..
         cmake --build .
 
     - name: test

CMakeLists.txt

@@ -29,7 +29,7 @@ option(FTP_EXTRA_TEST_FILES "Test with more large files fetched via FTP." OFF)
 option(LOGGING "Turn on internal logging messages. Only useful to g2c developers." OFF)
 option(PTHREADS "Turn on thread-safty with pthreads." OFF)
 option(UTILS "Build and install some utility programs." ON)
-option(BUILD_G2C "Build the new g2c API, experimental until 2.0.0 release." OFF)
+option(BUILD_G2C "Build the g2c file-based API." ON)
 
 # Developers can use this option to specify a local directory which
 # holds the test files. They will be copied instead of fetching the

src/grib2.h.in

@@ -254,7 +254,7 @@ g2int g2_addfield(unsigned char *cgrib, g2int ipdsnum, g2int *ipdstmpl,
                   float *fld, g2int ngrdpts, g2int ibmap, g2int *bmap);
 g2int g2_gribend(unsigned char *cgrib);
 
-/* The new g2c API is being introduced in version 2.0 of the library. */
+/* The file-based g2c API was introduced in version 2.0.0 of the library. */
 
 /* Data types. */
 #define G2C_BYTE 1    /**< signed 1 byte integer */