packages/gdal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 3.7.2

Browse Source 
(cherry picked from commit 01f4bf9aa8e0535b643f5e0638be174d5dc769db)
This commit is contained in:
desert-sailor 2024-08-29 16:39:47 +08:00 committed by openeuler-sync-bot
parent 154462a8ea
commit 87fed29c83
14 changed files with 363 additions and 694 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
0001-Fix-build-error-with-libxml2-2.12.patch Normal file
View File

@ -0,0 +1,44 @@
From befb52ff36b58582c8afb262041eeab718f6a013 Mon Sep 17 00:00:00 2001
From: desert-sailor <dongxing.wang_a@thundersoft.com>
Date: Fri, 22 Mar 2024 10:08:42 +0800
Subject: [PATCH 1/2] Fix build error with libxml2 2.12
---
gcore/gdaljp2metadatagenerator.cpp | 7 ++++++-
port/cpl_xml_validate.cpp | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/gcore/gdaljp2metadatagenerator.cpp b/gcore/gdaljp2metadatagenerator.cpp
index b6caa2d..751fa3d 100644
--- a/gcore/gdaljp2metadatagenerator.cpp
+++ b/gcore/gdaljp2metadatagenerator.cpp
@@ -357,7 +357,12 @@ static CPLString GDALGMLJP2EvalExpr(const CPLString &osTemplate,
/************************************************************************/
static void GDALGMLJP2XPathErrorHandler(void * /* userData */,
- xmlErrorPtr error)
+#if LIBXML_VERSION >= 21200
+ const xmlError *error
+#else
+ xmlErrorPtr error
+#endif
+)
{
if (error->domain == XML_FROM_XPATH && error->str1 != nullptr &&
error->int1 < static_cast<int>(strlen(error->str1)))
diff --git a/port/cpl_xml_validate.cpp b/port/cpl_xml_validate.cpp
index 7eb49ff..29070d9 100644
--- a/port/cpl_xml_validate.cpp
+++ b/port/cpl_xml_validate.cpp
@@ -914,7 +914,7 @@ static void CPLLibXMLWarningErrorCallback(void *ctx, const char *msg, ...)
if (strstr(pszStr, "since this namespace was already imported") == nullptr)
{
- xmlErrorPtr pErrorPtr = xmlGetLastError();
+ const xmlError *pErrorPtr = xmlGetLastError();
const char *pszFilename = static_cast<char *>(ctx);
char *pszStrDup = CPLStrdup(pszStr);
int nLen = static_cast<int>(strlen(pszStrDup));
--
2.43.0

55
0002-Fix-build-error-with-pre-installed-version-in-the-PA.patch Normal file
View File

@ -0,0 +1,55 @@
From 83075c1bd26890ef8e5a1186246e965db89b487b Mon Sep 17 00:00:00 2001
From: desert-sailor <dongxing.wang_a@thundersoft.com>
Date: Fri, 22 Mar 2024 11:26:53 +0800
Subject: [PATCH 2/2] Fix build error with pre-installed version in the PATH
---
swig/python/CMakeLists.txt | 7 ++++++-
swig/python/install_python.cmake.in | 9 +++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt
index b9c35c9..ca2bd0e 100644
--- a/swig/python/CMakeLists.txt
+++ b/swig/python/CMakeLists.txt
@@ -270,9 +270,14 @@ if (Python_Interpreter_FOUND)
set(GDAL_LIB_DEP_FOR_PY_SO "${GDAL_LIB_TARGET_NAME}")
endif()
+ if(WIN32)
+ set(PATH_SEP ";")
+ else()
+ set(PATH_SEP ":")
+ endif()
add_custom_command(
OUTPUT ${PY_SO_LIST}
- COMMAND ${CMAKE_COMMAND} ${WERROR_DEV_FLAG} -P "${BUILD_EXT_FILENAME}"
+ COMMAND ${CMAKE_COMMAND} -E env "\"PATH=${PROJECT_BINARY_DIR}/apps${PATH_SEP}$ENV{PATH}\"" ${CMAKE_COMMAND} ${WERROR_DEV_FLAG} -P "${BUILD_EXT_FILENAME}"
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${GDAL_LIB_DEP_FOR_PY_SO} ${GDAL_PYTHON_PYSOURCES} ${GDAL_PYTHON_CSOURCES} "${BUILD_EXT_FILENAME}"
${PROJECT_SOURCE_DIR}/gcore/gdal_priv.h)
diff --git a/swig/python/install_python.cmake.in b/swig/python/install_python.cmake.in
index 7c812b5..f24bd19 100644
--- a/swig/python/install_python.cmake.in
+++ b/swig/python/install_python.cmake.in
@@ -17,10 +17,15 @@ endif()
if(NOT "@SETUPTOOLS_USE_DISTUTILS@x" STREQUAL "x")
set(ENV{SETUPTOOLS_USE_DISTUTILS} @SETUPTOOLS_USE_DISTUTILS@)
endif()
+if(WIN32)
+ set(PATH_SEP ";")
+else()
+ set(PATH_SEP ":")
+endif()
if(DEFINED INSTALL_PREFIX)
- execute_process(COMMAND "@Python_EXECUTABLE_CMAKE@" "@SETUP_PY_FILENAME@" install ${ROOT_DIR_ARG} @INSTALL_ARGS@ "${INSTALL_PREFIX}"
+ execute_process(COMMAND ${CMAKE_COMMAND} -E env "PATH=@PROJECT_BINARY_DIR@/apps${PATH_SEP}$ENV{PATH}" "@Python_EXECUTABLE_CMAKE@" "@SETUP_PY_FILENAME@" install ${ROOT_DIR_ARG} @INSTALL_ARGS@ "${INSTALL_PREFIX}"
WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@")
else()
- execute_process(COMMAND "@Python_EXECUTABLE_CMAKE@" "@SETUP_PY_FILENAME@" install ${ROOT_DIR_ARG} @INSTALL_ARGS@
+ execute_process(COMMAND ${CMAKE_COMMAND} -E env "PATH=@PROJECT_BINARY_DIR@/apps${PATH_SEP}$ENV{PATH}" "@Python_EXECUTABLE_CMAKE@" "@SETUP_PY_FILENAME@" install ${ROOT_DIR_ARG} @INSTALL_ARGS@
WORKING_DIRECTORY "@CMAKE_CURRENT_BINARY_DIR@")
endif()
--
2.43.0

11
cpl-config.h Normal file
View File

@ -0,0 +1,11 @@
#include <bits/wordsize.h>
#if __WORDSIZE == 32
#include "gdal/cpl_config-32.h"
#else
#if __WORDSIZE == 64
#include "gdal/cpl_config-64.h"
#else
#error "Unknown word size"
#endif
#endif

12
gdal-1.9.0-java.patch
View File

@ -1,12 +0,0 @@
diff --git a/gdal/swig/java/java.opt b/gdal/swig/java/java.opt
index 6aba3e6..4b88fc6 100644
--- a/gdal/swig/java/java.opt
+++ b/gdal/swig/java/java.opt
@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
JAVAC=$(JAVA_HOME)/bin/javac
JAVA=$(JAVA_HOME)/bin/java
JAR=$(JAVA_HOME)/bin/jar
-JAVA_INCLUDE=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+JAVA_INCLUDE=-I/usr/lib/jvm/java/include/ -I/usr/lib/jvm/java/include/linux

13
gdal-2.3.0-zlib.patch
View File

@ -1,13 +0,0 @@
diff --git a/gdal/frmts/mrf/mrf_band.cpp b/gdal/frmts/mrf/mrf_band.cpp
index 95caf6e..2cdb730 100644
--- a/gdal/frmts/mrf/mrf_band.cpp
+++ b/gdal/frmts/mrf/mrf_band.cpp
@@ -49,7 +49,7 @@
#include <vector>
#include <assert.h>
-#include "../zlib/zlib.h"
+#include <zlib.h>
CPL_CVSID("$Id$")

29
gdal-2.3.1-perl-build.patch
View File

@ -1,29 +0,0 @@
diff --git a/gdal/swig/perl/GNUmakefile b/gdal/swig/perl/GNUmakefile
index 68d389d..2dfd533 100644
--- a/gdal/swig/perl/GNUmakefile
+++ b/gdal/swig/perl/GNUmakefile
@@ -20,16 +20,14 @@ generate: ${WRAPPERS}
if [ -f OSR.pm ]; then mv OSR.pm lib/Geo; fi
if [ -f GNM.pm ]; then mv GNM.pm lib/Geo; fi
-build: gdal_wrap.cc Makefile_Geo__GDAL
+build: Makefile_Geo__GDAL
$(MAKE) -f Makefile_Geo__GDAL
$(MAKE) -f Makefile_Geo__GDAL__Const
$(MAKE) -f Makefile_Geo__OSR
if [ -f Makefile_Geo__OGR ]; then $(MAKE) -f Makefile_Geo__OGR; fi
if [ -f Makefile_Geo__GNM ]; then $(MAKE) -f Makefile_Geo__GNM; fi
-gdal_wrap.cc: generate
-
-Makefile_Geo__GDAL: gdal_wrap.cc
+Makefile_Geo__GDAL: Makefile.PL
perl Makefile.PL INSTALL_BASE=$(INST_PREFIX)
test: build
@@ -66,3 +64,5 @@ doc: .FORCE
.FORCE:
perl parse-for-doxygen.pl > all.pm; doxygen; rm -f all.pm
+
+.PHONY: generate

BIN
gdal-2.3.1.tar.gz
View File

Binary file not shown.

BIN
gdal-3.7.2.tar.xz Normal file
View File

Binary file not shown.

13
gdal-completion.patch
View File

@ -1,13 +0,0 @@
diff --git a/gdal/scripts/GNUmakefile b/gdal/scripts/GNUmakefile
index 8f039e4..fd1115a 100644
--- a/gdal/scripts/GNUmakefile
+++ b/gdal/scripts/GNUmakefile
@@ -5,6 +5,6 @@ completion:
install:
if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
- $(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
- cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
+ $(INSTALL_DIR) $(DESTDIR)`pkg-config --variable=compatdir bash-completion` ; \
+ $(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)`pkg-config --variable=compatdir bash-completion`/gdal; \
fi

11
gdal-config Executable file
View File

@ -0,0 +1,11 @@
#!/bin/bash
ARCH=$(uname -m)
case $ARCH in
x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 )
gdal-config-64 ${*}
;;
*)
gdal-config-32 ${*}
;;
esac

815
gdal.spec
View File

@ -1,12 +1,8 @@
%global proj_somaj 12
# Tests can be of a different version
%global run_tests 0
%global run_tests 1
%global bashcompletiondir %(pkg-config --variable=compatdir bash-completion)
%if 0%{?bootstrap}
%global build_refman 0
%global with_mysql 0
%global mysql --without-mysql
%global with_poppler 0
@ -14,9 +10,6 @@
%global with_spatialite 0
%global spatialite --without-spatialite
%else
# Enable/disable generating refmans
# texlive currently broken deps and FTBFS in rawhide
%global build_refman 1
# https://bugzilla.redhat.com/show_bug.cgi?id=1490492
%global with_mysql 1
%global mysql --with-mysql
@ -27,130 +20,92 @@
%global spatialite "--with-spatialite"
%endif
Name: gdal
Version: 3.7.2
Release: 1
Summary: GIS file format library
License: MIT
URL: http://www.gdal.org
Source0: http://download.osgeo.org/gdal/%{version}/gdal-%{version}.tar.xz
Source1: http://download.osgeo.org/%{name}/%{version}/%{name}autotest-%{version}.tar.gz
Source2: gdal-config
Name: gdal
Version: 2.3.1
Release: 2
Summary: GIS file format library
Group: System Environment/Libraries
License: MIT
URL: http://www.gdal.org
Source0: https://github.com/OSGeo/gdal/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: %{name}.pom
# Add some utils to the default install target
Patch0: gdal_utils.patch
Patch1: 0001-Fix-build-error-with-libxml2-2.12.patch
Patch2: 0002-Fix-build-error-with-pre-installed-version-in-the-PA.patch
# Patch to use system g2clib
# Patch for JNI library location
# Fix bash-completion install dir
Patch0: %{name}-completion.patch
# Alternatives for Java
Patch1: %{name}-1.9.0-java.patch
Patch2: %{name}-2.3.0-zlib.patch
# https://github.com/OSGeo/gdal/pull/876
Patch3: %{name}-2.3.1-perl-build.patch
Patch4: gdal_pdfsdk.patch
BuildRequires: gcc gcc-c++
BuildRequires: ant
BuildRequires: libtool
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: armadillo-devel
BuildRequires: bash-completion
BuildRequires: cfitsio-devel
BuildRequires: chrpath
BuildRequires: curl-devel
BuildRequires: doxygen
BuildRequires: expat-devel
BuildRequires: fontconfig-devel
BuildRequires: freexl-devel
BuildRequires: g2clib-static
BuildRequires: geos-devel
BuildRequires: ghostscript
BuildRequires: hdf-devel
BuildRequires: hdf-static
BuildRequires: hdf5-devel
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
BuildRequires: javapackages-local
BuildRequires: json-c-devel
BuildRequires: libgeotiff-devel
BuildRequires: libgta-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: gmock-devel
BuildRequires: armadillo-devel
BuildRequires: bison
BuildRequires: cfitsio-devel
BuildRequires: CharLS-devel
BuildRequires: curl-devel
BuildRequires: expat-devel
BuildRequires: freexl-devel
BuildRequires: geos-devel
BuildRequires: giflib-devel
BuildRequires: gtest-devel
BuildRequires: hdf-devel
BuildRequires: hdf5-devel
BuildRequires: json-c-devel
BuildRequires: libdap-devel
BuildRequires: libgeotiff-devel
BuildRequires: libgta-devel
BuildRequires: libjpeg-devel
# BuildRequires: libkml-devel
# BuildRequires: liblerc-devel
BuildRequires: libpng-devel
BuildRequires: libpq-devel
%if %{with_spatialite}
BuildRequires: libspatialite-devel
BuildRequires: libspatialite-devel
%endif
BuildRequires: libtiff-devel
BuildRequires: libwebp-devel
BuildRequires: libtool
BuildRequires: giflib-devel
BuildRequires: netcdf-devel
BuildRequires: libdap-devel
BuildRequires: libtiff-devel
BuildRequires: libtirpc-devel
BuildRequires: libwebp-devel
BuildRequires: libzstd-devel
%if 0%{?with_mysql}
BuildRequires: mariadb-connector-c-devel
BuildRequires: mariadb-connector-c-devel
%endif
BuildRequires: python3-numpy
BuildRequires: pcre-devel
BuildRequires: ogdi-devel
BuildRequires: perl-devel
BuildRequires: perl-generators
BuildRequires: openjpeg2-devel
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: %{_bindir}/pkg-config
BuildRequires: netcdf-devel
BuildRequires: ogdi-devel
BuildRequires: openexr-devel
BuildRequires: openjpeg2-devel
BuildRequires: pcre2-devel
%if 0%{?with_poppler}
BuildRequires: poppler-devel
BuildRequires: poppler-devel
%endif
BuildRequires: postgresql-devel
BuildRequires: proj-devel
BuildRequires: python3-devel
BuildRequires: sqlite-devel
BuildRequires: swig
%if %{build_refman}
BuildRequires: texlive-latex
BuildRequires: texlive-collection-fontsrecommended
BuildRequires: texlive-collection-latex
BuildRequires: texlive-epstopdf
BuildRequires: tex(multirow.sty)
BuildRequires: tex(sectsty.sty)
BuildRequires: tex(tabu.sty)
BuildRequires: tex(tocloft.sty)
BuildRequires: tex(xtab.sty)
%endif
BuildRequires: unixODBC-devel
BuildRequires: xerces-c-devel
BuildRequires: xz-devel
BuildRequires: zlib-devel
BuildRequires: libtirpc-devel
BuildRequires: texlive-newunicodechar
BuildRequires: proj-devel >= 5.2.0
BuildRequires: qhull-devel
BuildRequires: sqlite-devel
BuildRequires: swig
BuildRequires: unixODBC-devel
BuildRequires: xerces-c-devel
BuildRequires: xz-devel
BuildRequires: zlib-devel
# Python
BuildRequires: python3-devel
BuildRequires: python3-numpy
BuildRequires: python3-setuptools
BuildRequires: python3-pytest >= 3.6
BuildRequires: python3-lxml >= 4.5.1
# Java
# For 'mvn_artifact' and 'mvn_install'
BuildRequires: ant
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: javapackages-local
BuildRequires: jpackage-utils
# Run time dependency for gpsbabel driver
Requires: gpsbabel
Requires: gpsbabel
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# proj DL-opened in ogrct.cpp, see also fix in %%prep
%if 0%{?__isa_bits} == 64
Requires: libproj.so.%{proj_somaj}()(64bit)
%else
Requires: libproj.so.%{proj_somaj}
%endif
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# We have multilib triage
%if "%{_lib}" == "lib"
%global cpuarch 32
%else
%global cpuarch 64
%endif
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%description
Geospatial Data Abstraction Library (GDAL/OGR) is a cross platform
@ -164,30 +119,25 @@ GDAL/OGR is the most widely used geospatial data access library.
%package devel
Summary: Development files for the GDAL file format library
Group: Development/Libraries
Requires: pkgconfig
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-static < 1.9.0-1
Summary: Development files for the GDAL file format library
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
This package contains development files for GDAL.
%package libs
Summary: GDAL file format library
Group: System Environment/Libraries
# https://trac.osgeo.org/gdal/ticket/3978#comment:5
Obsoletes: %{name}-ruby < 1.11.0-1
Summary: GDAL file format library
# See frmts/grib/degrib/README.TXT
Provides: bundled(g2lib) = 1.6.0
Provides: bundled(degrib) = 2.14
%description libs
This package contains the GDAL file format library.
# No complete java yet in EL8
%package java
Summary: Java modules for the GDAL file format library
Group: Development/Libraries
Requires: jpackage-utils
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@ -197,547 +147,188 @@ The GDAL Java modules provide support to handle multiple GIS file formats.
%package javadoc
Summary: Javadocs for %{name}
Group: Documentation
Requires: jpackage-utils
BuildArch: noarch
BuildArch: noarch
%description javadoc
This package contains the API documentation for %{name}.
%package perl
Summary: Perl modules for the GDAL file format library
Group: Development/Libraries
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description perl
The GDAL Perl modules provide support to handle multiple GIS file formats.
%package -n python3-gdal
%{?python_provide:%python_provide python3-gdal}
Summary: Python modules for the GDAL file format library
Group: Development/Libraries
Requires: python3-numpy
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Obsoletes: gdal-python3 < 2.3.1
Provides: gdal-python3
Summary: Python modules for the GDAL file format library
Requires: python3-numpy
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description -n python3-gdal
The GDAL Python 3 modules provide support to handle multiple GIS file formats.
%package doc
Summary: Documentation for GDAL
Group: Documentation
BuildArch: noarch
%package python-tools
Summary: Python tools for the GDAL file format library
Requires: python3-gdal
%description doc
This package contains HTML and PDF documentation for GDAL.
# We don't want to provide private Python extension libs
%global __provides_exclude_from %{python3_sitearch}/.*\.so$
%description python-tools
The GDAL Python package provides number of tools for programming and
manipulating GDAL file format library
%prep
%setup -q -n %{name}-%{version}
%autosetup -N -p1 -n %{name}-%{version}
# Delete bundled libraries
rm -rf frmts/zlib
rm -rf frmts/png/libpng
rm -rf frmts/gif/giflib
rm -rf frmts/jpeg/libjpeg \
frmts/jpeg/libjpeg12
rm -rf frmts/gtiff/libgeotiff \
frmts/gtiff/libtiff
rm -rf frmts/jpeg/libjpeg
rm -rf frmts/jpeg/libjpeg12
rm -rf frmts/gtiff/libgeotiff
rm -rf frmts/gtiff/libtiff
rm -rf mrf/LERCV1
rm -rf third_party/LercLib
%patch0 -p1 -b .completion~
%patch1 -p1 -b .java~
%patch2 -p1 -b .zlib~
%patch3 -p1 -b .perl-build~
%patch4 -p1 -b .gdal_pdfsdk~
# Setup autotest directory
tar xf %{SOURCE1}
mv %{name}autotest-%{version} autotest
# Sanitize linebreaks and encoding
set +x
for f in `find . -type f` ; do
if file $f | grep -q ISO-8859 ; then
set -x
iconv -f ISO-8859-1 -t UTF-8 $f > ${f}.tmp && \
mv -f ${f}.tmp $f
set +x
fi
if file $f | grep -q CRLF ; then
set -x
sed -i -e 's|\r||g' $f
set +x
fi
done
set -x
for f in gdal/apps; do
pushd $f
chmod 644 *.cpp
popd
done
# Replace hard-coded library- and include paths
sed -i 's|-L\$with_cfitsio -L\$with_cfitsio/lib -lcfitsio|-lcfitsio|g' gdal/configure
sed -i 's|-I\$with_cfitsio -I\$with_cfitsio/include|-I\$with_cfitsio/include/cfitsio|g' gdal/configure
sed -i 's|-L\$with_netcdf -L\$with_netcdf/lib -lnetcdf|-lnetcdf|g' gdal/configure
sed -i 's|-L\$DODS_LIB -ldap++|-ldap++|g' gdal/configure
sed -i 's|-L\$with_ogdi -L\$with_ogdi/lib -logdi|-logdi|g' gdal/configure
sed -i 's|-L\$with_jpeg -L\$with_jpeg/lib -ljpeg|-ljpeg|g' gdal/configure
sed -i 's|-L\$with_libtiff\/lib -ltiff|-ltiff|g' gdal/configure
sed -i 's|-lgeotiff -L$with_geotiff $LIBS|-lgeotiff $LIBS|g' gdal/configure
sed -i 's|-L\$with_geotiff\/lib -lgeotiff $LIBS|-lgeotiff $LIBS|g' gdal/configure
# libproj is dlopened; upstream sources point to .so, which is usually not present
# http://trac.osgeo.org/gdal/ticket/3602
sed -i 's|libproj.so|libproj.so.%{proj_somaj}|g' gdal/ogr/ogrct.cpp
# Fix Python samples to depend on correct interpreter
mkdir -p gdal/swig/python3/samples
pushd gdal/swig/python/samples
for f in `find . -name '*.py'`; do
sed 's|^#!.\+python$|#!/usr/bin/python3|' $f > ../../python3/samples/$f
chmod --reference=$f ../../python3/samples/$f
done
popd
# Adjust check for LibDAP version
# http://trac.osgeo.org/gdal/ticket/4545
%if %cpuarch == 64
sed -i 's|with_dods_root/lib|with_dods_root/lib64|' gdal/configure
%endif
# Add our custom cflags when trying to find geos
# https://bugzilla.redhat.com/show_bug.cgi?id=1284714
sed -i 's|CFLAGS=\"${GEOS_CFLAGS}\"|CFLAGS=\"${CFLAGS} ${GEOS_CFLAGS}\"|g' gdal/configure
# Need to patch autotest
%autopatch -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -fPIC"
export CXXFLAGS="$CFLAGS -I%{_includedir}/libgeotiff -I%{_includedir}/tirpc -I%{_includedir}/cfitsio"
export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libgeotiff -I%{_includedir}/tirpc -I%{_includedir}/cfitsio"
%cmake \
-DCMAKE_INSTALL_INCLUDEDIR=include/gdal \
-DGDAL_JAVA_INSTALL_DIR=%{_jnidir}/%{name} \
-DGDAL_USE_JPEG12_INTERNAL=OFF \
-DENABLE_DEFLATE64=OFF \
-DGDAL_USE_LERC_INTERNAL=OFF
sed -i "s#-Wp, -Wp,#-Wp,#g" `grep "Wp, -Wp," -rl ./`
%make_build
# For future reference:
# epsilon: Stalled review -- https://bugzilla.redhat.com/show_bug.cgi?id=660024
# Building without pgeo driver, because it drags in Java
%global g2clib grib2c
pushd ./gdal
./autogen.sh
# Fix mandir
sed -i "s|^mandir=.*|mandir='\${prefix}/share/man'|" configure
%configure \
LIBS="-ltirpc" \
--with-autoload=%{_libdir}/%{name}plugins \
--datadir=%{_datadir}/%{name}/ \
--includedir=%{_includedir}/%{name}/ \
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--with-armadillo \
--with-curl \
--with-cfitsio=%{_prefix} \
--with-dods-root=%{_prefix} \
--with-expat \
--with-freexl \
--with-geos \
--with-geotiff \
--with-gif \
--with-gta \
--with-hdf4 \
--with-hdf5 \
--with-java \
--with-jpeg \
--with-libjson-c \
--without-jpeg12 \
--with-liblzma \
--with-libtiff \
--with-libz \
--without-mdb \
%{mysql} \
--with-netcdf \
--with-odbc \
--with-ogdi \
--without-msg \
--with-openjpeg \
--with-pcraster \
--with-pg \
--with-png \
%{poppler} \
%{spatialite} \
--with-sqlite3 \
--with-threads \
--with-webp \
--with-xerces \
--enable-shared \
--with-libkml
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
sed -i "s/-Lexternal\/lib/-L\/usr\/lib64/g" GDALmake.opt
sed -i "s/-I\/usr\/include\/poppler//g" configure
sed -i "s/-I\/usr\/include\/poppler//g" configure.ac
sed -i "s/-I\/usr\/include\/poppler//g" GDALmake.opt
POPPLER_OPTS="POPPLER_0_20_OR_LATER=yes POPPLER_0_23_OR_LATER=yes POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes"
POPPLER_OPTS="$POPPLER_OPTS POPPLER_0_58_OR_LATER=yes"
make %{?_smp_mflags} $POPPLER_OPTS
make man
make docs
popd
# Build some utilities, as requested in BZ #1271906
pushd gdal/ogr/ogrsf_frmts/s57/
make all
popd
pushd gdal/frmts/iso8211/
make all
popd
# Make Java module and documentation
pushd gdal/swig/java
make
./make_doc.sh
popd
# Make Python modules
pushd gdal/swig/python
%py3_build
popd
# Make Python modules
pushd gdal/swig/perl
make generate
#perl Makefile.PL INSTALLDIRS=%%{perl_vendorarch}
perl Makefile.PL INSTALLDIRS=vendor
%make_build
popd
# --------- Documentation ----------
# No useful documentation in swig
%global docdirs gdal/apps gdal/doc gdal/doc/br gdal/doc/ru gdal/ogr gdal/ogr/ogrsf_frmts gdal/frmts/gxf gdal/frmts/iso8211 gdal/frmts/pcidsk gdal/frmts/sdts gdal/frmts/vrt gdal/ogr/ogrsf_frmts/dgn/
for docdir in %{docdirs}; do
# CreateHTML and PDF documentation, if specified
pushd $docdir
if [ ! -f Doxyfile ]; then
doxygen -g
else
doxygen -u
fi
sed -i -e 's|^GENERATE_LATEX|GENERATE_LATEX = YES\n#GENERATE_LATEX |' Doxyfile
sed -i -e 's|^GENERATE_HTML|GENERATE_HTML = YES\n#GENERATE_HTML |' Doxyfile
sed -i -e 's|^USE_PDFLATEX|USE_PDFLATEX = YES\n#USE_PDFLATEX |' Doxyfile
if [ $docdir == "doc/ru" ]; then
sed -i -e 's|^OUTPUT_LANGUAGE|OUTPUT_LANGUAGE = Russian\n#OUTPUT_LANGUAGE |' Doxyfile
fi
rm -rf latex html
doxygen
%if 0%{build_refman}
pushd latex
sed -i -e '/rfoot\[/d' -e '/lfoot\[/d' doxygen.sty
sed -i -e '/small/d' -e '/large/d' refman.tex
sed -i -e 's|pdflatex|pdflatex -interaction nonstopmode |g' Makefile
make refman.pdf || true
popd
%endif
popd
done
%if %{with mingw}
%mingw_cmake \
-DBUILD_TESTING=OFF \
-DCMAKE_INSTALL_INCLUDEDIR=include/gdal \
-DGDAL_USE_JPEG12_INTERNAL=OFF \
-DENABLE_DEFLATE64=OFF \
-DGDAL_USE_LERC_INTERNAL=OFF
%mingw_make_build
%endif
%install
rm -rf %{buildroot}
%make_install
pushd gdal/swig/python
%py3_install
popd
pushd gdal/swig/perl
%make_install
popd
pushd ./gdal
make DESTDIR=%{buildroot} \
install \
install-man
popd
install -pm 755 gdal/ogr/ogrsf_frmts/s57/s57dump %{buildroot}%{_bindir}
install -pm 755 gdal/frmts/iso8211/8211createfromxml %{buildroot}%{_bindir}
install -pm 755 gdal/frmts/iso8211/8211dump %{buildroot}%{_bindir}
install -pm 755 gdal/frmts/iso8211/8211view %{buildroot}%{_bindir}
# Directory for auto-loading plugins
mkdir -p %{buildroot}%{_libdir}/%{name}plugins
find %{buildroot} -name "*.dox" -exec rm -rf '{}' \;
find %{buildroot} -name "perllocal.pod" -exec rm -rf '{}' \;
# Correct permissions
find %{buildroot} -name "*.so" -exec chmod 755 '{}' \;
find %{buildroot} -name "*.pm" -exec chmod 644 '{}' \;
touch -r gdal/NEWS gdal/swig/java/gdal.jar
mkdir -p %{buildroot}%{_javadir}
cp -p gdal/swig/java/gdal.jar \
%{buildroot}%{_javadir}/%{name}.jar
# Install Maven pom and update version number
install -dm 755 %{buildroot}%{_mavenpomdir}
install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
sed -i 's|<version></version>|<version>%{version}</version>|' %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# Create depmap fragment
%add_maven_depmap JPP-%{name}.pom %{name}.jar
mkdir -p %{buildroot}%{_jnidir}/%{name}
cp -pl gdal/swig/java/.libs/*.so* \
%{buildroot}%{_jnidir}/%{name}/
chrpath --delete %{buildroot}%{_jnidir}/%{name}/*jni.so*
# Install Java API documentation in the designated place
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr gdal/swig/java/java/org %{buildroot}%{_javadocdir}/%{name}
# Install refmans
for docdir in %{docdirs}; do
pushd $docdir
path=%{_builddir}/%{name}-%{version}/refman
mkdir -p $path/html/$docdir
cp -r html $path/html/$docdir
# Install all Refmans
%if %{build_refman}
if [ -f latex/refman.pdf ]; then
mkdir -p $path/pdf/$docdir
cp latex/refman.pdf $path/pdf/$docdir
fi
%endif
popd
# List of manpages for python scripts
for file in %{buildroot}%{_bindir}/*.py; do
if [ -f %{buildroot}%{_mandir}/man1/`basename ${file/.py/.1*}` ]; then
echo "%{_mandir}/man1/`basename ${file/.py/.1*}`" >> gdal_python_manpages.txt
echo "%exclude %{_mandir}/man1/`basename ${file/.py/.1*}`" >> gdal_python_manpages_excludes.txt
fi
done
# Install formats documentation
for dir in gdal/gdal_frmts gdal/ogrsf_frmts; do
mkdir -p $dir
find gdal/frmts -name "*.html" -exec install -p -m 644 '{}' $dir \;
done
# Multilib
# - cpl_config.h is arch-dependent (contains various SIZEOF defines)
# - gdal-config stores arch-specific information
cp -a %{SOURCE2} %{buildroot}%{_bindir}/%{name}-config
install -p -D -m 644 gdal/port/cpl_config.h %{buildroot}%{_includedir}/%{name}/cpl_config-%{cpuarch}.h
#>>>>>>>>>>>>>
cat > %{buildroot}%{_includedir}/%{name}/cpl_config.h <<EOF
#include <bits/wordsize.h>
#if __WORDSIZE == 32
#include "gdal/cpl_config-32.h"
#else
#if __WORDSIZE == 64
#include "gdal/cpl_config-64.h"
#else
#error "Unknown word size"
#endif
#endif
EOF
#<<<<<<<<<<<<<
touch -r gdal/NEWS gdal/port/cpl_config.h
# Create and install pkgconfig file
# http://trac.osgeo.org/gdal/ticket/3470
#>>>>>>>>>>>>>
cat > %{name}.pc <<EOF
prefix=%{_prefix}
exec_prefix=%{_prefix}
libdir=%{_libdir}
includedir=%{_includedir}
Name: GDAL
Description: GIS file format library
Version: %{version}
Libs: -L\${libdir} -lgdal
Cflags: -I\${includedir}/%{name}
EOF
#<<<<<<<<<<<<<
mkdir -p %{buildroot}%{_libdir}/pkgconfig/
install -m 644 %{name}.pc %{buildroot}%{_libdir}/pkgconfig/
touch -r gdal/NEWS %{buildroot}%{_libdir}/pkgconfig/%{name}.pc
# Multilib gdal-config
# Rename the original script to gdal-config-$arch (stores arch-specific information)
# and create a script to call one or the other -- depending on detected architecture
mv %{buildroot}%{_bindir}/%{name}-config %{buildroot}%{_bindir}/%{name}-config-%{cpuarch}
#>>>>>>>>>>>>>
cat > %{buildroot}%{_bindir}/%{name}-config <<EOF
#!/bin/bash
ARCH=\$(uname -m)
case \$ARCH in
x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 )
%{name}-config-64 \${*}
;;
*)
%{name}-config-32 \${*}
;;
esac
EOF
#<<<<<<<<<<<<<
touch -r gdal/NEWS %{buildroot}%{_bindir}/%{name}-config
chmod 755 %{buildroot}%{_bindir}/%{name}-config
# Clean up junk
rm -f %{buildroot}%{_bindir}/*.dox
#jni-libs and libgdal are also built static (*.a)
#.exists and .packlist stem from Perl
for junk in {*.a,*.la,*.bs,.exists,.packlist} ; do
find %{buildroot} -name "$junk" -exec rm -rf '{}' \;
done
# Don't duplicate license files
rm -f %{buildroot}%{_datadir}/%{name}/LICENSE.TXT
# Throw away random API man mages plus artefact seemingly caused by Doxygen 1.8.1 or 1.8.1.1
for f in 'GDAL*' BandProperty ColorAssociation CutlineTransformer DatasetProperty EnhanceCBInfo ListFieldDesc NamedColor OGRSplitListFieldLayer VRTBuilder; do
rm -rf %{buildroot}%{_mandir}/man1/$f.1*
done
rm -f %{buildroot}%{_mandir}/man1/*_%{name}-%{version}_apps_*
rm -f %{buildroot}%{_mandir}/man1/_home_rouault_dist_wrk_gdal_apps_.1*
%if 0%{run_tests}
%check
%if %{run_tests}
for i in -I/usr/lib/jvm/java/include{,/linux}; do
java_inc="$java_inc $i"
done
pushd ./autotest
# Export test enviroment
export PYTHONPATH=$PYTHONPATH:%{buildroot}%{python_sitearch}
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir}
export GDAL_DATA=%{buildroot}%{_datadir}/%{name}/
# Remove some test cases that would require special preparation
rm -rf ogr/ogr_pg.py # No database available
rm -rf ogr/ogr_mysql.py # No database available
rm -rf osr/osr_esri.py # ESRI datum absent
rm -rf osr/osr_erm.py # File from ECW absent
# Run tests but force normal exit in the end
./run_all.py || true
popd
%ctest || :
%endif
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files
%{bashcompletiondir}/*
%{_bindir}/gdallocationinfo
%files -f gdal_python_manpages_excludes.txt
%{_bindir}/8211*
%{_bindir}/gdal_contour
%{_bindir}/gdal_create
%{_bindir}/gdal_grid
%{_bindir}/gdal_rasterize
%{_bindir}/gdal_translate
%{_bindir}/gdal_viewshed
%{_bindir}/gdaladdo
%{_bindir}/gdalinfo
%{_bindir}/gdaldem
%{_bindir}/gdalbuildvrt
%{_bindir}/gdaltindex
%{_bindir}/gdalwarp
%{_bindir}/gdal_grid
%{_bindir}/gdaldem
%{_bindir}/gdalenhance
%{_bindir}/gdalinfo
%{_bindir}/gdallocationinfo
%{_bindir}/gdalmanage
%{_bindir}/gdalserver
%{_bindir}/gdalmdiminfo
%{_bindir}/gdalmdimtranslate
%{_bindir}/gdalsrsinfo
%{_bindir}/gdaltindex
%{_bindir}/gdaltransform
%{_bindir}/nearblack
%{_bindir}/ogr*
%{_bindir}/8211*
%{_bindir}/s57*
%{_bindir}/testepsg
%{_bindir}/gdalwarp
%{_bindir}/gnmanalyse
%{_bindir}/gnmmanage
%{_mandir}/man1/gdal*.1*
%{_bindir}/nearblack
%{_bindir}/ogr2ogr
%{_bindir}/ogrinfo
%{_bindir}/ogrlineref
%{_bindir}/ogrtindex
%{_bindir}/s57dump
%{_bindir}/sozip
%{_datadir}/bash-completion/completions/*
%exclude %{_datadir}/bash-completion/completions/*.py
%{_mandir}/man1/*
%exclude %{_mandir}/man1/gdal-config.1*
%exclude %{_mandir}/man1/gdal2tiles.1*
%exclude %{_mandir}/man1/gdal_fillnodata.1*
%exclude %{_mandir}/man1/gdal_merge.1*
%exclude %{_mandir}/man1/gdal_retile.1*
%exclude %{_mandir}/man1/gdal_sieve.1*
%{_mandir}/man1/nearblack.1*
%{_mandir}/man1/ogr*.1*
%{_mandir}/man1/gnm*.1.*
# Python manpages excluded in -f gdal_python_manpages_excludes.txt
%files libs
%doc gdal/LICENSE.TXT gdal/NEWS gdal/PROVENANCE.TXT gdal/COMMITTERS
%{_libdir}/libgdal.so.20
%{_libdir}/libgdal.so.20.*
%{_datadir}/%{name}
%dir %{_libdir}/%{name}plugins
%license LICENSE.TXT
%doc NEWS.md PROVENANCE.TXT COMMITTERS
%{_libdir}/libgdal.so.33
%{_libdir}/libgdal.so.33.*
%{_datadir}/%{name}/
%{_libdir}/gdalplugins/
%files devel
%{_bindir}/%{name}-config
%{_bindir}/%{name}-config-%{cpuarch}
%{_mandir}/man1/gdal-config.1*
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*.h
%{_libdir}/*.so
%{_bindir}/%{name}-config*
%{_includedir}/%{name}/
%{_libdir}/lib%{name}.so
%{_libdir}/cmake/gdal/
%{_libdir}/pkgconfig/%{name}.pc
%files java -f .mfiles
%doc gdal/swig/java/apps
%{_jnidir}/%{name}/
%files javadoc
%{_javadocdir}/%{name}
%files perl
%doc gdal/swig/perl/README
%{perl_vendorarch}/*
%{_mandir}/man3/*.3pm*
%{_mandir}/man1/gdal-config.1*
%files -n python3-gdal
%doc gdal/swig/python/README.txt
%doc gdal/swig/python3/samples
%{_bindir}/*.py
%{_mandir}/man1/pct2rgb.1*
%{_mandir}/man1/rgb2pct.1*
%{_mandir}/man1/gdal2tiles.1*
%{_mandir}/man1/gdal_fillnodata.1*
%{_mandir}/man1/gdal_merge.1*
%{_mandir}/man1/gdal_retile.1*
%{_mandir}/man1/gdal_sieve.1*
%{python3_sitearch}/osgeo
%{python3_sitearch}/GDAL-%{version}-py*.egg-info
%{python3_sitearch}/osr.py
%{python3_sitearch}/__pycache__/osr.*.py*
%{python3_sitearch}/ogr.py
%{python3_sitearch}/__pycache__/ogr.*.py*
%{python3_sitearch}/gdal*.py
%{python3_sitearch}/__pycache__/gdal*.*.py*
%{python3_sitearch}/gnm.py*
%{python3_sitearch}/__pycache__/gnm.*.py*
%doc swig/python/README.rst
%{python3_sitearch}/GDAL-%{version}-py*.egg-info/
%{python3_sitearch}/osgeo/
%{python3_sitearch}/osgeo_utils/
%files doc
%doc gdal/gdal_frmts gdal/ogrsf_frmts
%if %{build_refman}
%doc refman
%endif
%files python-tools -f gdal_python_manpages.txt
%{_bindir}/gdal_calc.py
%{_bindir}/gdal_edit.py
%{_bindir}/gdal_fillnodata.py
%{_bindir}/gdal_merge.py
%{_bindir}/gdal_pansharpen.py
%{_bindir}/gdal_polygonize.py
%{_bindir}/gdal_proximity.py
%{_bindir}/gdal_retile.py
%{_bindir}/gdal_sieve.py
%{_bindir}/gdal2tiles.py
%{_bindir}/gdal2xyz.py
%{_bindir}/gdalattachpct.py
%{_bindir}/gdalcompare.py
%{_bindir}/gdalmove.py
%{_bindir}/ogr_layer_algebra.py
%{_bindir}/ogrmerge.py
%{_bindir}/pct2rgb.py
%{_bindir}/rgb2pct.py
%{_datadir}/bash-completion/completions/*.py
%files java
%{_jnidir}/%{name}/gdal-%{version}-sources.jar
%{_jnidir}/%{name}/gdal-%{version}.jar
%{_jnidir}/%{name}/gdal-%{version}.pom
%{_jnidir}/%{name}/libgdalalljni.so
%files javadoc
%{_jnidir}/%{name}/gdal-%{version}-javadoc.jar
%changelog
* Thu Aug 29 2024 Dongxing Wang <dongxing.wang_a@thundersoft.com> - 3.7.2-1
- Update to 3.7.2
* Fri Apr 01 2022 tanyulong <tanyulong@kylinos.cn> - 2.3.1-2
- add config.rpath and remove jasper ,fix compile error

15
gdal_pdfsdk.patch
View File

@ -1,15 +0,0 @@
diff --git a/gdal/frmts/pdf/pdfsdk_headers.h b/gdal/frmts/pdf/pdfsdk_headers.h
index 9150b0f..3f5ed9b 100644
--- a/gdal/frmts/pdf/pdfsdk_headers.h
+++ b/gdal/frmts/pdf/pdfsdk_headers.h
@@ -50,8 +50,8 @@
#pragma warning( disable : 4244 ) /* conversion from 'const int' to 'Guchar', possible loss of data */
#endif
-#include <goo/gtypes.h>
-#include <goo/GooList.h>
+#include <poppler/goo/gtypes.h>
+#include <poppler/goo/GooList.h>
/* begin of poppler xpdf includes */
#include <poppler/Object.h>

39
gdal_utils.patch Normal file
View File

@ -0,0 +1,39 @@
diff -rupN --no-dereference gdal-3.7.2-fedora/frmts/iso8211/CMakeLists.txt gdal-3.7.2-fedora-new/frmts/iso8211/CMakeLists.txt
--- gdal-3.7.2-fedora/frmts/iso8211/CMakeLists.txt 2023-09-05 11:06:01.000000000 +0200
+++ gdal-3.7.2-fedora-new/frmts/iso8211/CMakeLists.txt 2023-09-13 18:08:12.415548075 +0200
@@ -15,15 +15,18 @@ gdal_standard_includes(gdal_iso8211)
# Because linking an OBJECT library
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
- add_executable(8211dump EXCLUDE_FROM_ALL 8211dump.cpp)
+ add_executable(8211dump 8211dump.cpp)
target_include_directories(8211dump PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
target_link_libraries(8211dump PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
+ install(TARGETS 8211dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- add_executable(8211view EXCLUDE_FROM_ALL 8211view.cpp)
+ add_executable(8211view 8211view.cpp)
target_include_directories(8211view PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
target_link_libraries(8211view PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
+ install(TARGETS 8211view RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- add_executable(8211createfromxml EXCLUDE_FROM_ALL 8211createfromxml.cpp)
+ add_executable(8211createfromxml 8211createfromxml.cpp)
target_include_directories(8211createfromxml PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
target_link_libraries(8211createfromxml PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
+ install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif ()
diff -rupN --no-dereference gdal-3.7.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.7.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
--- gdal-3.7.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-09-05 11:06:01.000000000 +0200
+++ gdal-3.7.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-09-13 18:08:12.417548017 +0200
@@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA
gdal_standard_includes(ogr_S57)
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
- add_executable(s57dump EXCLUDE_FROM_ALL s57dump.cpp)
+ add_executable(s57dump s57dump.cpp)
gdal_standard_includes(s57dump)
target_include_directories(s57dump PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
target_link_libraries(s57dump PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> ogr_S57 gdal_iso8211)
+ install(TARGETS s57dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif ()

BIN
gdalautotest-3.7.2.tar.gz Normal file
View File

Binary file not shown.