[Okular-devel] Review Request 123314: Use generated version and CMake config files

[Eugene Shalygin]

> On Квітень 14, 2015, 10:34 після полудня, Alex Richardson wrote:
> > With this I can build Kile, so I'd say Ship it
> 
> Eugene Shalygin wrote:
>     I can't.  My changes to test Kile are the following: http://pastebin.com/HMv9Ziku. And GCC says:
>     
>         In file included from ../../src/kileviewmanager.cpp:62:0:
>         /usr/include/okular/interfaces/viewerinterface.h:13:31: fatal error: okularcore_export.h: No such file or directory
>         #include "okularcore_export.h"
>     
>     Pephaps Okular::okularcore target should add path to its headers (/usr/include/okular/core/) to include_directories?
> 
> Eugene Shalygin wrote:
>     Instead of that now `/usr/lib64/cmake/Okular/OkularTargets.cmake` contains `INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/KF5;${_IMPORT_PREFIX}/include"`
> 
> Andreas Cord-Landwehr wrote:
>     @Eugene: just to check, did you apply all three patches (this RR, the other RR by Alex, and the paste from Alex with the patch for Kile)?
> 
> Eugene Shalygin wrote:
>     @cordlandwehr: Thank you, I've missed the second Okular patch! Now Kile compiles. But OkularTargets.cmake still contains that line which `include/KF5` which I beleive to be  incorrect.
> 
> Alex Richardson wrote:
>     I just pushed a fix for that issue, can you retest?

@arichardson now it is fine


- Eugene


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/123314/#review78939
-----------------------------------------------------------


On Квітень 14, 2015, 9:48 після полудня, Andreas Cord-Landwehr wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/123314/
> -----------------------------------------------------------
> 
> (Updated Квітень 14, 2015, 9:48 після полудня)
> 
> 
> Review request for Okular, Albert Astals Cid, Alex Richardson, and Eugene Shalygin.
> 
> 
> Repository: okular
> 
> 
> Description
> -------
> 
> Replace both the package version file by a generated file, as well as OkularConfig.cmake package configuration file.
> Note that with this change the compatibility CMake variable OKULAR_FOUND is not set anymore, use Okular_FOUND instead.
> 
> This patch (should) fix the regression on eg. Gentoo systems introduced by RR #123176
> 
> 
> Diffs
> -----
> 
>   CMakeLists.txt 56c9976 
>   OkularConfig.cmake 171b845 
>   OkularConfig.cmake.in PRE-CREATION 
>   core/version.h 855df95 
> 
> Diff: https://git.reviewboard.kde.org/r/123314/diff/
> 
> 
> Testing
> -------
> 
> Manual testing on a Debian system
> 
> @Eugene: does it fix the regression for you?
> 
> 
> Thanks,
> 
> Andreas Cord-Landwehr
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/okular-devel/attachments/20150415/57b7b1f2/attachment-0001.html>