Merge pull request #867 from pseiderer/fix-lcms2-static-linking-using-pgk-config
Fix lcms2 static linking using pgk config
This commit is contained in:
commit
0782cd075d
|
@ -113,12 +113,19 @@ if( BUILD_THIRDPARTY)
|
||||||
set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
|
set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
|
||||||
else(BUILD_THIRDPARTY)
|
else(BUILD_THIRDPARTY)
|
||||||
find_package(LCMS2)
|
find_package(LCMS2)
|
||||||
|
# Static only build:
|
||||||
|
# it is necessary to invoke pkg_check_module on lcms2 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)
|
||||||
|
pkg_check_modules(PC_LCMS2 QUIET lcms2)
|
||||||
|
endif(PKG_CONFIG_FOUND)
|
||||||
if(LCMS2_FOUND)
|
if(LCMS2_FOUND)
|
||||||
message(STATUS "Your system seems to have a LCMS2 lib available, we will use it")
|
message(STATUS "Your system seems to have a LCMS2 lib available, we will use it")
|
||||||
set(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE)
|
set(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE)
|
||||||
set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
|
set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
|
||||||
set(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE)
|
set(LCMS_LIBNAME ${LCMS2_LIBRARIES} ${PC_LCMS2_STATIC_LIBRARIES} PARENT_SCOPE)
|
||||||
set(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE)
|
set(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} ${PC_LCMS2_STATIC_INCLUDE_DIRS} PARENT_SCOPE)
|
||||||
else(LCMS2_FOUND) # not found lcms2
|
else(LCMS2_FOUND) # not found lcms2
|
||||||
# try to find LCMS
|
# try to find LCMS
|
||||||
find_package(LCMS)
|
find_package(LCMS)
|
||||||
|
|
Loading…
Reference in New Issue