headers
Robert Mathias Marmorstein | 8 Mar 2012 06:26
Picon
Favicon
Gravatar

Review Request: Fix confusing CMake messages

This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/104191/

Review request for KOffice.
By Robert Mathias Marmorstein.

Description

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 new wpg libraries. Essentially, instead of reporting that libwps was missing, it was reporting that the libwpg stream library was missing. While it's true that libwps IS the libwpg stream library, most distributions package 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 been corrected. This patch fixes both glitches.

Testing

KOffice builds and runs both with and without libwps and CMake correctly detects whether libwps is present.

Diffs

  • cmake/modules/FindWPG.cmake (cb12f91)
  • filters/artwork/CMakeLists.txt (b949dd9)

View Diff

 
_______________________________________________
koffice-devel mailing list
koffice-devel <at> kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel
Permalink | Reply |
headers
Robert Mathias Marmorstein | 8 Mar 2012 06:29
Picon
Favicon
Gravatar

Re: Review Request: Fix confusing CMake messages

This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/104191/

Review request for KOffice.
By Robert Mathias Marmorstein.

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

Changes

Oops. Missed a typo. Fixed now.

Description

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 new wpg libraries. Essentially, instead of reporting that libwps was missing, it was reporting that the libwpg stream library was missing. While it's true that libwps IS the libwpg stream library, most distributions package 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 been corrected. This patch fixes both glitches.

Testing

KOffice builds and runs both with and without libwps and CMake correctly detects whether libwps is present.

Diffs (updated)

  • cmake/modules/FindWPG.cmake (cb12f91)
  • filters/artwork/CMakeLists.txt (b949dd9)

View Diff

 
_______________________________________________
koffice-devel mailing list
koffice-devel <at> kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel
Permalink | Reply |
headers
Thomas Zander | 8 Mar 2012 20:42
Picon
Favicon

Re: Review Request: Fix confusing CMake messages

This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.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.

Description

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 new wpg libraries. Essentially, instead of reporting that libwps was missing, it was reporting that the libwpg stream library was missing. While it's true that libwps IS the libwpg stream library, most distributions package 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 been corrected. This patch fixes both glitches.

Testing

KOffice builds and runs both with and without libwps and CMake correctly detects whether libwps is present.

Diffs

  • cmake/modules/FindWPG.cmake (cb12f91)
  • filters/artwork/CMakeLists.txt (b949dd9)

View Diff

 
_______________________________________________
koffice-devel mailing list
koffice-devel <at> kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel
Permalink | Reply |

Gmane