Commit e41cf15c authored by Antoine Regimbeau's avatar Antoine Regimbeau

SB: add pkg config path for openjpeg in gdal

parent 509a1c64
Pipeline #1706 passed with stages
in 71 minutes and 33 seconds
......@@ -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
......
......@@ -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}")
......
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