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