]>
Commit | Line | Data |
---|---|---|
ef39772c AO |
1 | diff -ruNp calligra-2.8.7.orig/CMakeLists.txt calligra-2.8.7/CMakeLists.txt |
2 | --- calligra-2.8.7.orig/CMakeLists.txt 2014-11-30 15:02:18.000000000 +0100 | |
3 | +++ calligra-2.8.7/CMakeLists.txt 2019-03-01 13:32:40.627835371 +0100 | |
2c3920dc | 4 | @@ -438,8 +438,11 @@ macro_log_feature(QCA2_FOUND "QCA" "Qt C |
ef39772c AO |
5 | ## Test for exiv2 |
6 | ## | |
7 | set(EXIV2_MIN_VERSION "0.16") | |
8 | -macro_optional_find_package(Exiv2) | |
9 | -macro_log_feature(EXIV2_FOUND "Exiv2" "Image metadata library and tools" "http://www.exiv2.org" FALSE "0.16" "Required by Krita") | |
10 | +macro_optional_find_package(exiv2) | |
c4e26cd2 | 11 | +macro_log_feature(exiv2_FOUND "exiv2" "Image metadata library and tools" "http://www.exiv2.org" FALSE "0.16" "Required by Krita") |
2c3920dc JR |
12 | +if(exiv2_FOUND) |
13 | + set(EXIV2_LIBRARIES exiv2lib) | |
14 | +endif() | |
ef39772c AO |
15 | |
16 | ## | |
17 | ## Test for soprano | |
2c3920dc JR |
18 | @@ -937,9 +937,9 @@ |
19 | calligra_disable_product(SHEETS_PART "Eigen devel not found") | |
20 | endif(NOT EIGEN2_FOUND) | |
21 | ||
22 | -if(NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND) | |
23 | +if(NOT EIGEN2_FOUND OR NOT exiv2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND) | |
24 | calligra_disable_product(KRITA_APP "SharedMimeInfo|libeigen2|libexiv2|lcms devel not found ") | |
25 | -endif(NOT EIGEN2_FOUND OR NOT EXIV2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND) | |
26 | +endif(NOT EIGEN2_FOUND OR NOT exiv2_FOUND OR NOT HAVE_REQUIRED_LCMS_VERSION OR NOT SHARED_MIME_INFO_FOUND) | |
27 | ||
28 | if(NOT APPLE AND NOT REQUIRED_Xinput_FOUND) | |
29 | calligra_disable_product(KRITA_APP "Xinput devel not found ") |