1*4882a593SmuzhiyunFrom 226daa77ea5a35da306f9af2548f3e2c9e79f577 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Peter Seiderer <ps.report@gmx.net> 3*4882a593SmuzhiyunDate: Fri, 11 Nov 2016 23:35:13 +0100 4*4882a593SmuzhiyunSubject: [PATCH] thirdparty: lcms2: 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*4882a593SmuzhiyunFixes a buildroot build failure (see [1], [2] and [3]). 11*4882a593Smuzhiyun 12*4882a593Smuzhiyun[1] http://autobuild.buildroot.net/results/5ce/5cee20afd8bef5268832cddcb3a5270746be7a57 13*4882a593Smuzhiyun[2] http://lists.busybox.net/pipermail/buildroot/2016-November/177187.html 14*4882a593Smuzhiyun[3] http://lists.busybox.net/pipermail/buildroot/2016-November/177188.html 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunSigned-off-by: Peter Seiderer <ps.report@gmx.net> 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun thirdparty/CMakeLists.txt | 11 +++++++++-- 19*4882a593Smuzhiyun 1 file changed, 9 insertions(+), 2 deletions(-) 20*4882a593Smuzhiyun 21*4882a593Smuzhiyundiff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt 22*4882a593Smuzhiyunindex cd6a5e1391b0..a3a8494d89b1 100644 23*4882a593Smuzhiyun--- a/thirdparty/CMakeLists.txt 24*4882a593Smuzhiyun+++ b/thirdparty/CMakeLists.txt 25*4882a593Smuzhiyun@@ -113,12 +113,19 @@ if( BUILD_THIRDPARTY) 26*4882a593Smuzhiyun set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE) 27*4882a593Smuzhiyun else(BUILD_THIRDPARTY) 28*4882a593Smuzhiyun find_package(LCMS2) 29*4882a593Smuzhiyun+ # Static only build: 30*4882a593Smuzhiyun+ # it is necessary to invoke pkg_check_module on lcms2 since it may have 31*4882a593Smuzhiyun+ # several other dependencies not declared by its cmake module, but they are 32*4882a593Smuzhiyun+ # in the its pkgconfig module. 33*4882a593Smuzhiyun+ if(PKG_CONFIG_FOUND) 34*4882a593Smuzhiyun+ pkg_check_modules(PC_LCMS2 QUIET lcms2) 35*4882a593Smuzhiyun+ endif(PKG_CONFIG_FOUND) 36*4882a593Smuzhiyun if(LCMS2_FOUND) 37*4882a593Smuzhiyun message(STATUS "Your system seems to have a LCMS2 lib available, we will use it") 38*4882a593Smuzhiyun set(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE) 39*4882a593Smuzhiyun set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE) 40*4882a593Smuzhiyun- set(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE) 41*4882a593Smuzhiyun- set(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE) 42*4882a593Smuzhiyun+ set(LCMS_LIBNAME ${LCMS2_LIBRARIES} ${PC_LCMS2_STATIC_LIBRARIES} PARENT_SCOPE) 43*4882a593Smuzhiyun+ set(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} ${PC_LCMS2_STATIC_INCLUDE_DIRS} PARENT_SCOPE) 44*4882a593Smuzhiyun else(LCMS2_FOUND) # not found lcms2 45*4882a593Smuzhiyun # try to find LCMS 46*4882a593Smuzhiyun find_package(LCMS) 47*4882a593Smuzhiyun-- 48*4882a593Smuzhiyun2.10.2 49*4882a593Smuzhiyun 50