[poppler] [PATCH] Fixes to building with recent versions of CMake and Ninja

[Adam Reichold]

Hello,

Am 28.12.2015 um 18:51 schrieb Albert Astals Cid:
> El Friday 25 December 2015, a les 14:23:50, Adam Reichold va escriure:
>> Hello,
>>
>> after a recent upgrade of either CMake or Ninja, building with both the
>> Qt4 and Qt5 tests enabled started to fail. This seems to be caused by
>> CMake's automoc feature being broken due to the test targets being
>> present twice which Ninja does also complain about.
>>
>> The attached patch tries to:
>> * Fix this by making the test target names unique for their Qt4 and Qt5
>> variants.
>> * Fix the warning on CMake policy 0022 by making use of the LINK_PRIVATE
>> flag.
>> * Make it possible to find OpenJPEG using pkg-config as well, i.e.
>> prefer a pkg-config manifest if one exits. (This is necessary for
>> example to build using CMake and OpenJPEG on Arch Linux.)
> 
> The patch has conflicts in cmake/modules/FindLIBOPENJPEG.cmake:23 can you 
> rebase it?

I am sorry about that, I thought I branched from the latest master. I
did pull and rebased on b3425dd3261679958cd56c0f71995c15d2124433, newly
formatted patch attached.

> Cheers,
>   Albert

Best regards, Adam.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix-cmake-ninja-build-v2.patch
Type: text/x-patch
Size: 12892 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/poppler/attachments/20151228/16dacaad/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/poppler/attachments/20151228/16dacaad/attachment.sig>