From koffice-devel Thu Mar 08 19:42:09 2012 From: "Thomas Zander" Date: Thu, 08 Mar 2012 19:42:09 +0000 To: koffice-devel Subject: Re: Review Request: Fix confusing CMake messages Message-Id: <20120308194209.21809.71127 () vidsolbach ! de> X-MARC-Message: https://marc.info/?l=koffice-devel&m=133123580604385 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--===============5372615125250630167==" --===============5372615125250630167== Content-Type: multipart/alternative; boundary="===============0084612344678275129==" --===============0084612344678275129== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/104191/#review11244 ----------------------------------------------------------- Ship it! Ship It! - Thomas Zander On March 8, 2012, 5:29 a.m., Robert Mathias Marmorstein wrote: > = > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://git.reviewboard.kde.org/r/104191/ > ----------------------------------------------------------- > = > (Updated March 8, 2012, 5:29 a.m.) > = > = > Review request for KOffice. > = > = > Description > ------- > = > This fixes a problem with how CMake reports a missing libwps. I think th= is is a bug I introduced myself when upgrading things to the new wpg librar= ies. Essentially, instead of reporting that libwps was missing, it was rep= orting that the libwpg stream library was missing. While it's true that li= bwps IS the libwpg stream library, most distributions package it as libwps.= = > = > Additionally, the cmake module was not correctly checking the cache to se= e whether libwps had been installed. So if someone ran cmake, got the erro= r, and then installed wps, the error would come up even if the problem had = been corrected. = > = > This patch fixes both glitches. > = > = > Diffs > ----- > = > cmake/modules/FindWPG.cmake cb12f91 = > filters/artwork/CMakeLists.txt b949dd9 = > = > Diff: http://git.reviewboard.kde.org/r/104191/diff/ > = > = > Testing > ------- > = > KOffice builds and runs both with and without libwps and CMake correctly = detects whether libwps is present. > = > = > Thanks, > = > Robert Mathias Marmorstein > = > --===============0084612344678275129== Content-Type: text/html; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable
This is an automatically generated e-mail. To reply, visit: http://git.revie= wboard.kde.org/r/104191/

Ship it!

Ship It!
 









- Thomas






On March 8th, 2012, 5:29 a.m., Robert Mathias Marmorstein wrote:









 

  


Review request for KOffice.


By Robert Mathias Marmorstein.




Updated March 8, 2012, 5:29 a.m.








Descripti=
on 

 

 

  
   
This fixes a problem with how CMake reports a missing libwps=
.  I think this is a bug I introduced myself when upgrading things to the n=
ew wpg libraries.  Essentially, instead of reporting that libwps was missin=
g, it was reporting that the libwpg stream library was missing.  While it&#=
39;s true that libwps IS the libwpg stream library, most distributions pack=
age it as libwps.  =


Additionally, the cmake module was not correctly checking the cache to see =
whether libwps had been installed.  So if someone ran cmake, got the error,=
 and then installed wps, the error would come up even if the problem had be=
en corrected. =


This patch fixes both glitches.

  		
 






Testing <=
/h1>


 

  
   
KOffice builds and runs both with and without libwps and CMa=
ke correctly detects whether libwps is present.

  		
 








Diffs=
 


    

 
  • cmake/modules/FindWPG.cmake (cb12f91)
    • 

 
  • filters/artwork/CMakeLists.txt (b949dd9)
    • 





View Diff
--===============0084612344678275129==-- --===============5372615125250630167== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ koffice-devel mailing list koffice-devel@kde.org https://mail.kde.org/mailman/listinfo/koffice-devel --===============5372615125250630167==--