walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

thirdparty: tiff: append flags found by pkg-config if available 

This change allows to get all required CFLAGS/LDFLAGS in case of static only
build.

This build issue [1] was triggered by the Buildroot farms.

[1] http://autobuild.buildroot.net/results/d0d/d0d22727311d6300e0e400728126170407bfd699/build-end.log

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
This commit is contained in:
Samuel Martin 2016-11-06 16:29:08 +01:00
parent 7113c4e3bb
commit 75a7f1a53b
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
thirdparty/CMakeLists.txt vendored
View File

@ -1,5 +1,9 @@
# 3rd party libs # 3rd party libs
if(NOT BUILD_THIRDPARTY)
include(FindPkgConfig)
endif(NOT BUILD_THIRDPARTY)
#------------ #------------
# Try to find lib Z # Try to find lib Z
if(BUILD_THIRDPARTY) if(BUILD_THIRDPARTY)
@ -36,6 +40,9 @@ if(BUILD_THIRDPARTY)
else(BUILD_THIRDPARTY) else(BUILD_THIRDPARTY)
if(ZLIB_FOUND) if(ZLIB_FOUND)
find_package(PNG) find_package(PNG)
# Static only build:
# it is not necessary to invoke pkg_check_module on libpng, because libpng
# only depends on zlib, which is already checked.
if(PNG_FOUND) if(PNG_FOUND)
message(STATUS "Your system seems to have a PNG lib available, we will use it") message(STATUS "Your system seems to have a PNG lib available, we will use it")
set(OPJ_HAVE_PNG_H 1 PARENT_SCOPE) set(OPJ_HAVE_PNG_H 1 PARENT_SCOPE)
@ -66,12 +73,24 @@ if(BUILD_THIRDPARTY)
set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE) set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE)
else(BUILD_THIRDPARTY) else(BUILD_THIRDPARTY)
find_package(TIFF) find_package(TIFF)
# Static only build:
# it is necessary to invoke pkg_check_module on libtiff since it may have
# several other dependencies not declared by its cmake module, but they are
# in the its pkgconfig module.
if(PKG_CONFIG_FOUND)
foreach(pc_tiff_module tiff tiff3 tiff4 tiff-3 tiff-4 libtiff libtiff3 libtiff4 libtiff-3 libtiff-4)
pkg_check_modules(PC_TIFF QUIET ${pc_tiff_module})
if(PC_TIFF_FOUND)
break()
endif(PC_TIFF_FOUND)
endforeach()
endif(PKG_CONFIG_FOUND)
if(TIFF_FOUND) if(TIFF_FOUND)
message(STATUS "Your system seems to have a TIFF lib available, we will use it") message(STATUS "Your system seems to have a TIFF lib available, we will use it")
set(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE) set(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE)
set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE) set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE)
set(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE) set(TIFF_LIBNAME ${TIFF_LIBRARIES} ${PC_TIFF_STATIC_LIBRARIES} PARENT_SCOPE)
set(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE) set(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} ${PC_TIFF_STATIC_INCLUDE_DIRS} PARENT_SCOPE)
else(TIFF_FOUND) # not found else(TIFF_FOUND) # not found
set(OPJ_HAVE_TIFF_H 0 PARENT_SCOPE) set(OPJ_HAVE_TIFF_H 0 PARENT_SCOPE)
set(OPJ_HAVE_LIBTIFF 0 PARENT_SCOPE) set(OPJ_HAVE_LIBTIFF 0 PARENT_SCOPE)