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
Julien Cabieces
otb
Commits
0c714177
Commit
0c714177
authored
5 years ago
by
Rashad Kanavath
Browse files
Options
Downloads
Plain Diff
Merge branch '1880-proj-linking-to-gdal-in-superbuild' into 'develop'
Resolve "PROJ linking to GDAL in Superbuild" Closes
#1880
See merge request
!561
parents
618f2d30
9f1c6807
No related branches found
Branches containing commit
Tags
3.12.0
Tags containing commit
Loading
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
SuperBuild/CMake/External_gdal.cmake
+1
-0
1 addition, 0 deletions
SuperBuild/CMake/External_gdal.cmake
SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in
+1
-0
1 addition, 0 deletions
SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in
with
2 additions
and
0 deletions
SuperBuild/CMake/External_gdal.cmake
+
1
−
0
View file @
0c714177
...
...
@@ -105,6 +105,7 @@ if(UNIX)
--with-webp=no
--with-threads=yes
--with-freexl=no
--with-proj=yes
--with-libjson-c=internal
${
GDAL_SB_CONFIG
}
${
GDAL_SB_EXTRA_OPTIONS
}
...
...
This diff is collapsed.
Click to expand it.
SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in
+
1
−
0
View file @
0c714177
...
...
@@ -44,6 +44,7 @@ SQLITE_LIB=@SB_INSTALL_PREFIX_NATIVE@\lib\sqlite3.lib
SQLITE_HAS_COLUMN_METADATA=yes
# PROJ.4 stuff
PROJ_FLAGS = -DPROJ_STATIC -DPROJ_VERSION=4
PROJ_INCLUDE = -I@SB_INSTALL_PREFIX_NATIVE@\include
PROJ_LIBRARY = @SB_INSTALL_PREFIX_NATIVE@\lib\proj.lib
...
...
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