Skip to content

Doc: build_hints: document discrepancies between name of CMake options…#5811

Merged
rouault merged 3 commits intoOSGeo:masterfrom
rouault:doc_fix_5809
May 30, 2022
Merged

Doc: build_hints: document discrepancies between name of CMake options…#5811
rouault merged 3 commits intoOSGeo:masterfrom
rouault:doc_fix_5809

Conversation

@rouault
Copy link
Copy Markdown
Member

@rouault rouault commented May 29, 2022

…controlling driver build and driver names (fixes #5809)

@adamjstewart
Copy link
Copy Markdown
Contributor

Used all the mappings in this list and now I'm down to only the remaining missing flags:

CMake Warning:
  Manually-specified variables were not used by the project:

    GDAL_ENABLE_DRIVER_AIG
    GDAL_ENABLE_DRIVER_BAG
    GDAL_ENABLE_DRIVER_CAD
    GDAL_ENABLE_DRIVER_DIPEX
    GDAL_ENABLE_DRIVER_EEDAI
    GDAL_ENABLE_DRIVER_ESAT
    GDAL_ENABLE_DRIVER_GEORASTER
    GDAL_ENABLE_DRIVER_GRASS
    GDAL_ENABLE_DRIVER_GRASSASCIIGRID
    GDAL_ENABLE_DRIVER_ISG
    GDAL_ENABLE_DRIVER_JPEGXL
    GDAL_ENABLE_DRIVER_NGW
    GDAL_ENABLE_DRIVER_NWT_GRC
    GDAL_ENABLE_DRIVER_NWT_GRD
    GDAL_ENABLE_DRIVER_SRP
    OGR_ENABLE_DRIVER_EEDA
    OGR_ENABLE_DRIVER_GRASS

Any idea for these?

@rouault
Copy link
Copy Markdown
Member Author

rouault commented May 29, 2022

Any idea for these?

cf

--- a/doc/source/build_hints.rst
+++ b/doc/source/build_hints.rst
@@ -1814,17 +1814,27 @@ The following options are available to select a subset of drivers:
           LCP, LOSLAS, NDF, NTv2, PAUX, PNM, ROIPAC, RRASTER, SNODAS) are controlled
           by the GDAL_ENABLE_DRIVER_RAW option.
 
-        - Planetary raster formats (PDS, PDS4, ISIS, ISIS3, VICAR) are controlled by
+        - Planetary raster formats (PDS, PDS4, ISIS2, ISIS3, VICAR) are controlled by
           the GDAL_ENABLE_DRIVER_PDS option.
 
+        - The AAIGRID, GRASSASCIIGRID and ISG raster drivers are controlled by the GDAL_ENABLE_DRIVER_AAIGRID option.
+
         - The ECW and JP2ECW raster drivers are controlled by the GDAL_ENABLE_DRIVER_ECW option.
 
+        - The vector EEDA and raster EEDAI drivers are controlled by the GDAL_ENABLE_DRIVER_EEDA option.
+
         - The GSAG, GSBG and GS7BG raster drivers are controlled by the GDAL_ENABLE_DRIVER_GSG option.
 
+        - The HDF5 and BAG raster drivers are controlled by the GDAL_ENABLE_DRIVER_HDF5 option.
+
         - The MrSID and JP2MrSID raster drivers are controlled by the GDAL_ENABLE_DRIVER_MRSID option.
 
         - The NITF, RPFTOC and ECRGTOC raster drivers are controlled by the GDAL_ENABLE_DRIVER_NITF option.
 
+        - The NWT_GRD and NWT_GRC raster drivers are controlled by the GDAL_ENABLE_DRIVER_NORTHWOOD option.
+
+        - The SRP and ADRG raster drivers are controlled by the GDAL_ENABLE_DRIVER_ADRG option.
+
         - The Interlis 1 and Interlis 2 vector drivers are controlled by the GDAL_ENABLE_DRIVER_ILI option.
 
         - The WFS and OAPIF vector drivers are controlled by the GDAL_ENABLE_DRIVER_WFS option.
@@ -1835,6 +1845,12 @@ The following options are available to select a subset of drivers:
 
         There might be variations in naming, e.g. :
 
+        - the "AIG" raster driver is controlled by GDAL_ENABLE_DRIVER_AIGRID.
+
+        - the "ENVISAT" raster driver is controlled by GDAL_ENABLE_DRIVER_ESAT.
+
+        - the "GEOR" raster driver is controlled by GDAL_ENABLE_DRIVER_GEORASTER.
+
         - the "RST" raster driver is controlled by GDAL_ENABLE_DRIVER_IDRISI.
 
         - the "ElasticSearch" vector driver is controlled by OGR_ENABLE_DRIVER_ELASTIC.
@@ -1849,9 +1865,11 @@ The following options are available to select a subset of drivers:
         single GDALDriver instance) are controlled by either a GDAL_ENABLE_DRIVER_<driver_name>
         option or a OGR_ENABLE_DRIVER_<driver_name> one, but not both:
 
+        - The CAD drivers are controlled by the OGR_ENABLE_DRIVER_CAD option.
         - The netCDF drivers are controlled by the GDAL_ENABLE_DRIVER_NETCDF option.
         - The PDF drivers are controlled by the GDAL_ENABLE_DRIVER_PDF option.
         - The GPKG drivers are controlled by the OGR_ENABLE_DRIVER_GPKG option.
+        - The NGW drivers are controlled by the OGR_ENABLE_DRIVER_NGW option.
         - The SQLite drivers are controlled by the OGR_ENABLE_DRIVER_SQLITE option.
 
     .. note::

GDAL_ENABLE_DRIVER_DIPEX doesn't exist. It is one of the raw drivers
GDAL_ENABLE_DRIVER_JPEGXL is new to master

@adamjstewart
Copy link
Copy Markdown
Contributor

adamjstewart commented May 29, 2022

Should DIPEx be removed from https://gdal.org/drivers/raster/index.html? Or do you mean that it should be added to the list of "raw" drivers grouped together to the "RAW" flag?

…s controlling driver build and driver names (fixes OSGeo#5809)
@adamjstewart
Copy link
Copy Markdown
Contributor

adamjstewart commented May 29, 2022

Co-authored-by: Adam J. Stewart <[email protected]>
@rouault
Copy link
Copy Markdown
Member Author

rouault commented May 29, 2022

According to https://gdal.org/build_hints.html#brunsli, the MRF driver requires Brunsli,

this is an optional dependency

@rouault rouault merged commit fdccf9f into OSGeo:master May 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

CMake: mismatch between docs and driver flags

3 participants