Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Brad Hards
otb
Commits
e29970cd
Commit
e29970cd
authored
4 years ago
by
Cédric Traizet
Browse files
Options
Downloads
Patches
Plain Diff
REFAC: remove hdf5 patch for gdal and set HDF5_H5_IS_DLL variable instead (gdal 3.1.0)
parent
aa0ae237
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
SuperBuild/patches/GDAL/gdal-4-fixhdf5-win.diff
+0
-11
0 additions, 11 deletions
SuperBuild/patches/GDAL/gdal-4-fixhdf5-win.diff
SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in
+4
-0
4 additions, 0 deletions
SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in
with
4 additions
and
11 deletions
SuperBuild/patches/GDAL/gdal-4-fixhdf5-win.diff
deleted
100644 → 0
+
0
−
11
View file @
aa0ae237
--- gdal-2.4.1_orig/frmts/hdf5/makefile.vc 2019-03-15 13:30:02.000000000 +0100
+++ gdal-2.4.1/frmts/hdf5/makefile.vc 2019-04-05 17:43:22.356322797 +0200
@@ -7,7 +7,7 @@
PLUGIN_DLL = gdal_HDF5.dll
-EXTRAFLAGS = -I$(HDF5_DIR)\include -DWIN32 -D_HDF5USEDLL_
+EXTRAFLAGS = -I$(HDF5_DIR)\include -DWIN32 -DH5_BUILT_AS_DYNAMIC_LIB
!IF "$(HDF5_PLUGIN)" == "YES"
EXTRAFLAGS = $(EXTRAFLAGS) -DHDF5_PLUGIN
This diff is collapsed.
Click to expand it.
SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in
+
4
−
0
View file @
e29970cd
...
...
@@ -109,6 +109,10 @@ NETCDF_INC_DIR = @SB_INSTALL_PREFIX_NATIVE@\include
NETCDF_HAS_NC4 = YES
NETCDF_HAS_HDF4 = YES
# Needed to define H5_BUILT_AS_DYNAMIC_LIB for windows compilation
# scenarios where it is not exported on the target (non-CMake builds)
HDF5_H5_IS_DLL = YES
# Binding list. One or several in the following list
# csharp, java, python
BINDINGS=python
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment