Commit 9d8b3ca7 authored by Guillaume Pasero's avatar Guillaume Pasero

Merge branch 'sb-gdal-s2' into develop

parents 1e329df0 c5168111
......@@ -52,7 +52,9 @@ else()
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
DEPENDS ${${proj}_DEPENDENCIES}
UPDATE_COMMAND ${CMAKE_COMMAND} -E copy_directory ${GDAL_SB_SRC} ${GDAL_SB_BUILD_DIR}
PATCH_COMMAND ${CMAKE_COMMAND} -E touch ${GDAL_SB_SRC}/config.rpath COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/GDAL/GNUmakefile ${GDAL_SB_SRC}/swig/python/GNUmakefile
PATCH_COMMAND ${CMAKE_COMMAND} -E touch ${GDAL_SB_SRC}/config.rpath
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/GDAL/GNUmakefile ${GDAL_SB_SRC}/swig/python/GNUmakefile
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/patches/${proj}/S2_patch ${GDAL_SB_SRC}
CONFIGURE_COMMAND
# use 'env' because CTest launcher doesn't perform shell interpretation
${SB_ENV_CONFIGURE_CMD}
......@@ -61,6 +63,7 @@ else()
--enable-static=no
--without-ogdi
--without-jasper
--with-sentinel2
${GDAL_SB_CONFIG}
${GDAL_SB_EXTRA_OPTIONS}
BUILD_COMMAND $(MAKE)
......@@ -86,7 +89,9 @@ else()
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
DEPENDS ${${proj}_DEPENDENCIES}
PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${GDAL_SB_SRC} ${GDAL_SB_BUILD_DIR} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/GDAL/GNUmakefile ${GDAL_SB_SRC}/swig/python/GNUmakefile
PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${GDAL_SB_SRC} ${GDAL_SB_BUILD_DIR}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/GDAL/GNUmakefile ${GDAL_SB_SRC}/swig/python/GNUmakefile
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/patches/${proj}/S2_patch ${GDAL_SB_SRC}
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/${proj}/ogrsqlitevirtualogr.cpp
${GDAL_SB_BUILD_DIR}/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
BUILD_COMMAND nmake /f ${GDAL_SB_BUILD_DIR}/makefile.vc MSVC_VER=${MSVC_VERSION} EXT_NMAKE_OPT=${CMAKE_BINARY_DIR}/nmake_gdal_extra.opt
......
This diff is collapsed.
This diff is collapsed.
GDAL_ROOT = ..
EXTRAFLAGS = -DFRMT_ceos -DFRMT_aigrid -DFRMT_elas -DFRMT_hfa -DFRMT_gtiff\
-DFRMT_sdts -DFRMT_raw -DFRMT_gxf -DFRMT_ceos2 -DFRMT_png \
-DFRMT_dted -DFRMT_mem -DFRMT_jdem -DFRMT_gif \
-DFRMT_envisat -DFRMT_aaigrid -DFRMT_usgsdem -DFRMT_l1b \
-DFRMT_fit -DFRMT_vrt -DFRMT_xpm -DFRMT_bmp -DFRMT_rmf \
-DFRMT_nitf -DFRMT_pcidsk -DFRMT_airsar -DFRMT_rs2 \
-DFRMT_ilwis -DFRMT_msgn -DFRMT_rik -DFRMT_pcraster \
-DFRMT_leveller -DFRMT_sgi -DFRMT_srtmhgt -DFRMT_idrisi \
-DFRMT_jaxapalsar -DFRMT_ers -DFRMT_ingr -DFRMT_dimap \
-DFRMT_gff -DFRMT_terragen -DFRMT_gsg -DFRMT_cosar -DFRMT_pds \
-DFRMT_adrg -DFRMT_coasp -DFRMT_tsx -DFRMT_blx -DFRMT_til \
-DFRMT_r -DFRMT_northwood -DFRMT_saga -DFRMT_xyz -DFRMT_hf2 \
-DFRMT_kmlsuperoverlay -DFRMT_ozi -DFRMT_ctg -DFRMT_e00grid \
-DFRMT_zmap -DFRMT_ngsgeoid -DFRMT_pdf -DFRMT_iris -DFRMT_map \
-DFRMT_sentinel2
MOREEXTRA =
DIRLIST = $(EXTRAFLAGS:-DFRMT_=)
PLUGINFLAGS =
PLUGINDIRLIST = $(PLUGINFLAGS:-DFRMT_=)
!INCLUDE $(GDAL_ROOT)/nmake.opt
!IFDEF PG_INC_DIR
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_postgisraster
!ENDIF
!IFDEF JPEG_SUPPORTED
EXTRAFLAGS = -DFRMT_jpeg $(EXTRAFLAGS)
!ENDIF
!IFDEF BSB_SUPPORTED
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_bsb
!ENDIF
!IFDEF OGDIDIR
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_ogdi
!ELSE
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_zlib
!ENDIF
!IFDEF JASPER_DIR
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_jpeg2000
!ENDIF
!IFDEF OPENJPEG_ENABLED
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_openjpeg
!ENDIF
!IFDEF KAKDIR
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_jp2kak -DFRMT_jpipkak
!ENDIF
!IFDEF ECWDIR
!IF "$(ECW_PLUGIN)" != "YES"
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_ecw
!ELSE
PLUGINFLAGS = $(PLUGINFLAGS) -DFRMT_ecw
!ENDIF
!ENDIF
!IFDEF HDF4_DIR
!IF "$(HDF4_PLUGIN)" != "YES"
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_hdf4
!ENDIF
!ENDIF
!IFDEF HDF5_DIR
!IF "$(HDF5_PLUGIN)" != "YES"
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_hdf5
!ELSE
PLUGINFLAGS = $(PLUGINFLAGS) -DFRMT_hdf5
!ENDIF
!ENDIF
!IF DEFINED(MRSID_DIR) || DEFINED(MRSID_RASTER_DIR) || DEFINED(MRSID_LIDAR_DIR)
!INCLUDE mrsid\nmake.opt
!ENDIF
!IFDEF MRSID_RASTER_DIR
!IF "$(MRSID_PLUGIN)" != "YES"
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_mrsid
!ELSE
PLUGINFLAGS = $(PLUGINFLAGS) -DFRMT_mrsid
!ENDIF
!ENDIF
!IFDEF MRSID_LIDAR_DIR
!IF "$(MRSID_LIDAR_PLUGIN)" != "YES"
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_mrsid_lidar
!ELSE
PLUGINFLAGS = $(PLUGINFLAGS) -DFRMT_mrsid_lidar
!ENDIF
!ENDIF
!IFDEF FITS_INC_DIR
!IF "$(FITS_PLUGIN)" != "YES"
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_fits
!ELSE
PLUGINFLAGS = $(PLUGINFLAGS) -DFRMT_fits
!ENDIF
!ENDIF
!IFDEF DODS_DIR
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_dods
!ENDIF
!IFDEF NETCDF_SETTING
!IF "$(NETCDF_PLUGIN)" != "YES"
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_netcdf
!ELSE
PLUGINFLAGS = $(PLUGINFLAGS) -DFRMT_netcdf
!ENDIF
!ENDIF
!IFDEF GRIB_SETTING
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_grib
!ENDIF
!IFDEF CURL_LIB
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_wcs -DFRMT_wms
!ENDIF
!IFDEF SDE_ENABLED
!IF "$(SDE_PLUGIN)" != "YES"
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_sde
!ELSE
PLUGINFLAGS = $(PLUGINFLAGS) -DFRMT_sde
!ENDIF
!ENDIF
!IFDEF RASDAMAN_ENABLED
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_rasdaman
!ENDIF
!IFDEF OCI_LIB
!IF "$(OCI_PLUGIN)" != "YES"
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_georaster
!ELSE
PLUGINFLAGS = $(PLUGINFLAGS) -DFRMT_georaster
!ENDIF
!ENDIF
!IFDEF INCLUDE_OGR_FRMTS
!IFDEF SQLITE_LIB
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_rasterlite -DFRMT_mbtiles
!ENDIF
!ENDIF
!IFDEF WEBP_ENABLED
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_webp
!ENDIF
!IFDEF GTA_CFLAGS
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_gta
!ENDIF
!IFDEF INCLUDE_OGR_FRMTS
EXTRAFLAGS = $(EXTRAFLAGS) -DFRMT_arg
!ENDIF
default: o\gdalallregister.obj subdirs
list:
echo $(DIRLIST)
echo $(PLUGINDIRLIST)
subdirs:
for %d in ( $(DIRLIST) ) do \
cd %d \
&& $(MAKE) /f makefile.vc \
&& cd .. \
|| exit 1
plugindirs:
-for %d in ( $(PLUGINDIRLIST) ) do \
cd %d \
&& $(MAKE) /f makefile.vc plugin \
&& cd .. \
|| exit 1
o\gdalallregister.obj: gdalallregister.cpp ..\nmake.opt
$(CC) $(CFLAGS) $(MOREEXTRA) /c gdalallregister.cpp
copy gdalallregister.obj o
clean:
-del o\*.obj *.obj
-for %d in ( $(DIRLIST) ) do \
cd %d \
&& $(MAKE) /f makefile.vc clean \
&& cd .. \
|| exit 1
-for %d in ( $(PLUGINDIRLIST) ) do \
cd %d \
&& $(MAKE) /f makefile.vc clean \
&& cd .. \
|| exit 1
cd iso8211
$(MAKE) /f makefile.vc clean
plugins-install:
-for %d in ( $(PLUGINDIRLIST) ) do \
cd %d \
&& $(MAKE) /f makefile.vc plugin-install \
&& cd .. \
|| exit 1
html-install:
copy *.html $(HTMLDIR)
-for %d in ( $(DIRLIST) ) do \
copy %d\frmt_*.html $(HTMLDIR)
include ../../GDALmake.opt
OBJ = sentinel2dataset.o
default: $(OBJ:.o=.$(OBJ_EXT))
clean:
rm -f *.o $(O_OBJ)
install-obj: $(O_OBJ:.o=.$(OBJ_EXT))
OBJ = sentinel2dataset.obj
GDAL_ROOT = ..\..
!INCLUDE $(GDAL_ROOT)\nmake.opt
default: $(OBJ)
xcopy /D /Y *.obj ..\o
clean:
-del *.obj
/******************************************************************************
* $Id: gdal_frmts.h 27044 2014-03-16 23:41:27Z rouault $
*
* Project: GDAL
* Purpose: Prototypes for all format specific driver initializations.
* Author: Frank Warmerdam, warmerdam@pobox.com
*
******************************************************************************
* Copyright (c) 2001, Frank Warmerdam
* Copyright (c) 2007-2014, Even Rouault <even dot rouault at mines-paris dot org>
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
****************************************************************************/
#ifndef GDAL_FRMTS_H_INCLUDED
#define GDAL_FRMTS_H_INCLUDED
#include "cpl_port.h"
CPL_C_START
void CPL_DLL GDALRegister_GDB(void);
void CPL_DLL GDALRegister_GTiff(void);
void CPL_DLL GDALRegister_GXF(void);
void CPL_DLL GDALRegister_OGDI(void);
void CPL_DLL GDALRegister_HFA(void);
void CPL_DLL GDALRegister_AAIGrid(void);
void CPL_DLL GDALRegister_GRASSASCIIGrid(void);
void CPL_DLL GDALRegister_AIGrid(void);
void CPL_DLL GDALRegister_AIGrid2(void);
void CPL_DLL GDALRegister_CEOS(void);
void CPL_DLL GDALRegister_SAR_CEOS(void);
void CPL_DLL GDALRegister_SDTS(void);
void CPL_DLL GDALRegister_ELAS(void);
void CPL_DLL GDALRegister_EHdr(void);
void CPL_DLL GDALRegister_GenBin(void);
void CPL_DLL GDALRegister_PAux(void);
void CPL_DLL GDALRegister_ENVI(void);
void CPL_DLL GDALRegister_DOQ1(void);
void CPL_DLL GDALRegister_DOQ2(void);
void CPL_DLL GDALRegister_DTED(void);
void CPL_DLL GDALRegister_MFF(void);
void CPL_DLL GDALRegister_HKV(void);
void CPL_DLL GDALRegister_PNG(void);
void CPL_DLL GDALRegister_DDS(void);
void CPL_DLL GDALRegister_GTA(void);
void CPL_DLL GDALRegister_JPEG(void);
void CPL_DLL GDALRegister_JPEG2000(void);
void CPL_DLL GDALRegister_JP2KAK(void);
void CPL_DLL GDALRegister_JPIPKAK(void);
void CPL_DLL GDALRegister_MEM(void);
void CPL_DLL GDALRegister_JDEM(void);
void CPL_DLL GDALRegister_RASDAMAN(void);
void CPL_DLL GDALRegister_GRASS(void);
void CPL_DLL GDALRegister_PNM(void);
void CPL_DLL GDALRegister_GIF(void);
void CPL_DLL GDALRegister_BIGGIF(void);
void CPL_DLL GDALRegister_Envisat(void);
void CPL_DLL GDALRegister_FITS(void);
void CPL_DLL GDALRegister_ECW(void);
void CPL_DLL GDALRegister_JP2ECW(void);
void CPL_DLL GDALRegister_ECW_JP2ECW();
void CPL_DLL GDALRegister_FujiBAS(void);
void CPL_DLL GDALRegister_FIT(void);
void CPL_DLL GDALRegister_VRT(void);
void CPL_DLL GDALRegister_USGSDEM(void);
void CPL_DLL GDALRegister_FAST(void);
void CPL_DLL GDALRegister_HDF4(void);
void CPL_DLL GDALRegister_HDF4Image(void);
void CPL_DLL GDALRegister_L1B(void);
void CPL_DLL GDALRegister_LDF(void);
void CPL_DLL GDALRegister_BSB(void);
void CPL_DLL GDALRegister_XPM(void);
void CPL_DLL GDALRegister_BMP(void);
void CPL_DLL GDALRegister_GSC(void);
void CPL_DLL GDALRegister_NITF(void);
void CPL_DLL GDALRegister_RPFTOC(void);
void CPL_DLL GDALRegister_ECRGTOC(void);
void CPL_DLL GDALRegister_MrSID(void);
void CPL_DLL GDALRegister_MG4Lidar(void);
void CPL_DLL GDALRegister_PCIDSK(void);
void CPL_DLL GDALRegister_BT(void);
void CPL_DLL GDALRegister_DODS(void);
void CPL_DLL GDALRegister_GMT(void);
void CPL_DLL GDALRegister_netCDF(void);
void CPL_DLL GDALRegister_LAN(void);
void CPL_DLL GDALRegister_CPG(void);
void CPL_DLL GDALRegister_AirSAR(void);
void CPL_DLL GDALRegister_RS2(void);
void CPL_DLL GDALRegister_ILWIS(void);
void CPL_DLL GDALRegister_PCRaster(void);
void CPL_DLL GDALRegister_IDA(void);
void CPL_DLL GDALRegister_NDF(void);
void CPL_DLL GDALRegister_RMF(void);
void CPL_DLL GDALRegister_BAG(void);
void CPL_DLL GDALRegister_HDF5(void);
void CPL_DLL GDALRegister_HDF5Image(void);
void CPL_DLL GDALRegister_MSGN(void);
void CPL_DLL GDALRegister_MSG(void);
void CPL_DLL GDALRegister_RIK(void);
void CPL_DLL GDALRegister_Leveller(void);
void CPL_DLL GDALRegister_SGI(void);
void CPL_DLL GDALRegister_SRTMHGT(void);
void CPL_DLL GDALRegister_DIPEx(void);
void CPL_DLL GDALRegister_ISIS3(void);
void CPL_DLL GDALRegister_ISIS2(void);
void CPL_DLL GDALRegister_PDS(void);
void CPL_DLL GDALRegister_IDRISI(void);
void CPL_DLL GDALRegister_Terragen(void);
void CPL_DLL GDALRegister_WCS(void);
void CPL_DLL GDALRegister_WMS(void);
void CPL_DLL GDALRegister_HTTP(void);
void CPL_DLL GDALRegister_SDE(void);
void CPL_DLL GDALRegister_GSAG(void);
void CPL_DLL GDALRegister_GSBG(void);
void CPL_DLL GDALRegister_GS7BG(void);
void CPL_DLL GDALRegister_GRIB(void);
void CPL_DLL GDALRegister_INGR(void);
void CPL_DLL GDALRegister_ERS(void);
void CPL_DLL GDALRegister_PALSARJaxa(void);
void CPL_DLL GDALRegister_DIMAP();
void CPL_DLL GDALRegister_GFF(void);
void CPL_DLL GDALRegister_COSAR(void);
void CPL_DLL GDALRegister_TSX(void);
void CPL_DLL GDALRegister_ADRG(void);
void CPL_DLL GDALRegister_SRP(void);
void CPL_DLL GDALRegister_COASP(void);
void CPL_DLL GDALRegister_BLX(void);
void CPL_DLL GDALRegister_LCP(void);
void CPL_DLL GDALRegister_PGCHIP(void);
void CPL_DLL GDALRegister_TMS(void);
void CPL_DLL GDALRegister_EIR(void);
void CPL_DLL GDALRegister_GEOR(void);
void CPL_DLL GDALRegister_TIL(void);
void CPL_DLL GDALRegister_R(void);
void CPL_DLL GDALRegister_Rasterlite(void);
void CPL_DLL GDALRegister_EPSILON(void);
void CPL_DLL GDALRegister_PostGISRaster(void);
void CPL_DLL GDALRegister_NWT_GRD(void);
void CPL_DLL GDALRegister_NWT_GRC(void);
void CPL_DLL GDALRegister_SAGA(void);
void CPL_DLL GDALRegister_KMLSUPEROVERLAY(void);
void CPL_DLL GDALRegister_GTX(void);
void CPL_DLL GDALRegister_LOSLAS(void);
void CPL_DLL GDALRegister_Istar(void);
void CPL_DLL GDALRegister_NTv2(void);
void CPL_DLL GDALRegister_CTable2(void);
void CPL_DLL GDALRegister_JP2OpenJPEG(void);
void CPL_DLL GDALRegister_XYZ(void);
void CPL_DLL GDALRegister_HF2(void);
void CPL_DLL GDALRegister_PDF(void);
void CPL_DLL GDALRegister_JPEGLS(void);
void CPL_DLL GDALRegister_MAP(void);
void CPL_DLL GDALRegister_OZI(void);
void CPL_DLL GDALRegister_ACE2(void);
void CPL_DLL GDALRegister_CTG(void);
void CPL_DLL GDALRegister_E00GRID(void);
void CPL_DLL GDALRegister_SNODAS(void);
void CPL_DLL GDALRegister_WEBP(void);
void CPL_DLL GDALRegister_ZMap(void);
void CPL_DLL GDALRegister_NGSGEOID(void);
void CPL_DLL GDALRegister_MBTiles(void);
void CPL_DLL GDALRegister_ARG(void);
void CPL_DLL GDALRegister_IRIS(void);
void CPL_DLL GDALRegister_KRO(void);
void CPL_DLL GDALRegister_SENTINEL2(void);
CPL_C_END
#endif /* ndef GDAL_FRMTS_H_INCLUDED */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment