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 Osman
otb
Commits
e41cf15c
Commit
e41cf15c
authored
5 years ago
by
Antoine Regimbeau
Browse files
Options
Downloads
Patches
Plain Diff
SB: add pkg config path for openjpeg in gdal
parent
509a1c64
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/CMake/External_gdal.cmake
+4
-1
4 additions, 1 deletion
SuperBuild/CMake/External_gdal.cmake
SuperBuild/CMakeLists.txt
+3
-0
3 additions, 0 deletions
SuperBuild/CMakeLists.txt
with
7 additions
and
1 deletion
SuperBuild/CMake/External_gdal.cmake
+
4
−
1
View file @
e41cf15c
...
...
@@ -29,7 +29,9 @@ ADD_SUPERBUILD_CONFIGURE_VAR(GDAL TIFF_ROOT --with-libtiff)
ADD_SUPERBUILD_CONFIGURE_VAR
(
GDAL GEOTIFF_ROOT --with-geotiff
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
GDAL PNG_ROOT --with-png
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
GDAL JPEG_ROOT --with-jpeg
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
GDAL OPENJPEG_ROOT --with-openjpeg
)
# This is not needed as from GDAL 2.4 it uses pkg-config to find openjpeg.
# It is found thanks to the $PKG_CONFIG_PATH in SB_ENV_CONFIGURE_CMD
# ADD_SUPERBUILD_CONFIGURE_VAR(GDAL OPENJPEG_ROOT --with-openjpeg)
ADD_SUPERBUILD_CONFIGURE_VAR
(
GDAL SQLITE_ROOT --with-sqlite3
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
GDAL ZLIB_ROOT --with-libz
)
ADD_SUPERBUILD_CONFIGURE_VAR
(
GDAL EXPAT_ROOT --with-expat
)
...
...
@@ -88,6 +90,7 @@ if(UNIX)
--with-odbc=no
--with-ogdi=no
--with-pam
--with-openjpeg
--with-pcidsk=yes
--with-pcraster=no
--with-pcre=no
...
...
This diff is collapsed.
Click to expand it.
SuperBuild/CMakeLists.txt
+
3
−
0
View file @
e41cf15c
...
...
@@ -258,6 +258,9 @@ if(CMAKE_MODULE_LINKER_FLAGS)
list
(
APPEND SB_ENV_CONFIGURE_CMD
"LDFLAGS=
${
CMAKE_MODULE_LINKER_FLAGS
}
"
)
endif
()
# This is needed for gdal 2.4 in order to find OpenJPEG
list
(
APPEND SB_ENV_CONFIGURE_CMD
"PKG_CONFIG_PATH=
${
CMAKE_INSTALL_PREFIX
}
/lib/pkgconfig"
)
list
(
REMOVE_DUPLICATES SB_ENV_CONFIGURE_CMD
)
message
(
STATUS
"Environment setup for CMake (SB_CMAKE_COMMAND) :
${
SB_CMAKE_COMMAND
}
"
)
...
...
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