1*4882a593SmuzhiyunFrom 38f50c7d9ad3ba06b64583045665203afb53cbd9 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Samuel Martin <s.martin49@gmail.com> 3*4882a593SmuzhiyunDate: Sun, 6 Nov 2016 16:29:08 +0100 4*4882a593SmuzhiyunSubject: [PATCH] thirdparty: tiff: append flags found by pkg-config if 5*4882a593Smuzhiyun available 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunThis change allows to get all required CFLAGS/LDFLAGS in case of static only 8*4882a593Smuzhiyunbuild. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunThis build issue [1] was triggered by the Buildroot farms. 11*4882a593Smuzhiyun 12*4882a593Smuzhiyun[1] http://autobuild.buildroot.net/results/d0d/d0d22727311d6300e0e400728126170407bfd699/build-end.log 13*4882a593Smuzhiyun 14*4882a593SmuzhiyunSigned-off-by: Samuel Martin <s.martin49@gmail.com> 15*4882a593Smuzhiyun--- 16*4882a593Smuzhiyun thirdparty/CMakeLists.txt | 23 +++++++++++++++++++++-- 17*4882a593Smuzhiyun 1 file changed, 21 insertions(+), 2 deletions(-) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt 20*4882a593Smuzhiyunindex cb24b43b58e2..cd6a5e1391b0 100644 21*4882a593Smuzhiyun--- a/thirdparty/CMakeLists.txt 22*4882a593Smuzhiyun+++ b/thirdparty/CMakeLists.txt 23*4882a593Smuzhiyun@@ -1,5 +1,9 @@ 24*4882a593Smuzhiyun # 3rd party libs 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun+if(NOT BUILD_THIRDPARTY) 27*4882a593Smuzhiyun+ include(FindPkgConfig) 28*4882a593Smuzhiyun+endif(NOT BUILD_THIRDPARTY) 29*4882a593Smuzhiyun+ 30*4882a593Smuzhiyun #------------ 31*4882a593Smuzhiyun # Try to find lib Z 32*4882a593Smuzhiyun if(BUILD_THIRDPARTY) 33*4882a593Smuzhiyun@@ -36,6 +40,9 @@ if(BUILD_THIRDPARTY) 34*4882a593Smuzhiyun else(BUILD_THIRDPARTY) 35*4882a593Smuzhiyun if(ZLIB_FOUND) 36*4882a593Smuzhiyun find_package(PNG) 37*4882a593Smuzhiyun+ # Static only build: 38*4882a593Smuzhiyun+ # it is not necessary to invoke pkg_check_module on libpng, because libpng 39*4882a593Smuzhiyun+ # only depends on zlib, which is already checked. 40*4882a593Smuzhiyun if(PNG_FOUND) 41*4882a593Smuzhiyun message(STATUS "Your system seems to have a PNG lib available, we will use it") 42*4882a593Smuzhiyun set(OPJ_HAVE_PNG_H 1 PARENT_SCOPE) 43*4882a593Smuzhiyun@@ -66,12 +73,24 @@ if(BUILD_THIRDPARTY) 44*4882a593Smuzhiyun set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE) 45*4882a593Smuzhiyun else(BUILD_THIRDPARTY) 46*4882a593Smuzhiyun find_package(TIFF) 47*4882a593Smuzhiyun+ # Static only build: 48*4882a593Smuzhiyun+ # it is necessary to invoke pkg_check_module on libtiff since it may have 49*4882a593Smuzhiyun+ # several other dependencies not declared by its cmake module, but they are 50*4882a593Smuzhiyun+ # in the its pkgconfig module. 51*4882a593Smuzhiyun+ if(PKG_CONFIG_FOUND) 52*4882a593Smuzhiyun+ foreach(pc_tiff_module tiff tiff3 tiff4 tiff-3 tiff-4 libtiff libtiff3 libtiff4 libtiff-3 libtiff-4) 53*4882a593Smuzhiyun+ pkg_check_modules(PC_TIFF QUIET ${pc_tiff_module}) 54*4882a593Smuzhiyun+ if(PC_TIFF_FOUND) 55*4882a593Smuzhiyun+ break() 56*4882a593Smuzhiyun+ endif(PC_TIFF_FOUND) 57*4882a593Smuzhiyun+ endforeach() 58*4882a593Smuzhiyun+ endif(PKG_CONFIG_FOUND) 59*4882a593Smuzhiyun if(TIFF_FOUND) 60*4882a593Smuzhiyun message(STATUS "Your system seems to have a TIFF lib available, we will use it") 61*4882a593Smuzhiyun set(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE) 62*4882a593Smuzhiyun set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE) 63*4882a593Smuzhiyun- set(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE) 64*4882a593Smuzhiyun- set(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE) 65*4882a593Smuzhiyun+ set(TIFF_LIBNAME ${TIFF_LIBRARIES} ${PC_TIFF_STATIC_LIBRARIES} PARENT_SCOPE) 66*4882a593Smuzhiyun+ set(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} ${PC_TIFF_STATIC_INCLUDE_DIRS} PARENT_SCOPE) 67*4882a593Smuzhiyun else(TIFF_FOUND) # not found 68*4882a593Smuzhiyun set(OPJ_HAVE_TIFF_H 0 PARENT_SCOPE) 69*4882a593Smuzhiyun set(OPJ_HAVE_LIBTIFF 0 PARENT_SCOPE) 70*4882a593Smuzhiyun-- 71*4882a593Smuzhiyun2.10.2 72*4882a593Smuzhiyun 73