diff options
| author | Bryce Harrington <bryce@bryceharrington.org> | 2015-05-02 06:05:29 +0000 |
|---|---|---|
| committer | bryce <bryce@ubuntu.com> | 2015-05-02 06:05:29 +0000 |
| commit | 046602640873c37516516c9903079d6c5528bd05 (patch) | |
| tree | 76f66d6192799a1b296e473268249fd03bd24bb9 /CMakeScripts/Modules | |
| parent | bzrignore: Fix *.cmake ignorance (diff) | |
| download | inkscape-046602640873c37516516c9903079d6c5528bd05.tar.gz inkscape-046602640873c37516516c9903079d6c5528bd05.zip | |
cmake: Fix WPG 0.2 build variables
WPG 0.1 appears to have been tested and made to work, but a parallel set
of code checks WPG 0.2 and the variable names are all wrong (looks like
they didn't get properly updated from the original automake scripts).
The detection fails entirely on Ubuntu 14.04 and probably other recent
distros.
With this change, cmake now builds inkscape properly for me.
(bzr r14087)
Diffstat (limited to 'CMakeScripts/Modules')
| -rw-r--r-- | CMakeScripts/Modules/FindLibWPG.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/CMakeScripts/Modules/FindLibWPG.cmake b/CMakeScripts/Modules/FindLibWPG.cmake index 4f173da2d..136267070 100644 --- a/CMakeScripts/Modules/FindLibWPG.cmake +++ b/CMakeScripts/Modules/FindLibWPG.cmake @@ -38,17 +38,17 @@ else (LIBWPG_LIBRARIES AND LIBWPG_INCLUDE_DIRS) INKSCAPE_PKG_CONFIG_FIND(LIBWPG-0.2 libwpg-0.2 0 libwpg/libwpg.h libwpg-0.2 wpg-0.2) INKSCAPE_PKG_CONFIG_FIND(LIBWPD-0.9 libwpd-0.9 0 libwpd/libwpd.h libwpd-0.9 wpd-0.9) INKSCAPE_PKG_CONFIG_FIND(LIBWPD-STREAM-0.9 libwpd-stream-0.9 0 libwpd/libwpd.h libwpd-0.9 wpd-stream-0.9) - if (LIBWPG02_FOUND) - list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPG02_INCLUDE_DIRS}) - list(APPEND LIBWPG_LIBRARIES ${LIBWPG02_LIBRARIES}) + if (LIBWPG-0.2_FOUND AND LIBWPD-STREAM-0.9_FOUND AND LIBWPD-0.9_FOUND) + list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPG-0.2_INCLUDE_DIRS}) + list(APPEND LIBWPG_LIBRARIES ${LIBWPG-0.2_LIBRARIES}) list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPD-0.9_INCLUDE_DIRS}) list(APPEND LIBWPG_LIBRARIES ${LIBWPD-0.9_LIBRARIES}) list(APPEND LIBWPG_INCLUDE_DIRS ${LIBWPD-STREAM-0.9_INCLUDE_DIRS}) list(APPEND LIBWPG_LIBRARIES ${LIBWPD-STREAM-0.9_LIBRARIES}) set(LIBWPG02_FOUND TRUE) - endif (LIBWPG02_FOUND) - if (LIBWPG01_FOUND OR LIBWPG_02_FOUND) + endif (LIBWPG-0.2_FOUND AND LIBWPD-STREAM-0.9_FOUND AND LIBWPD-0.9_FOUND) + if (LIBWPG-0.1_FOUND OR LIBWPG-0.2_FOUND) set(LIBWPG_FOUND TRUE) - endif (LIBWPG01_FOUND OR LIBWPG_02_FOUND) + endif (LIBWPG-0.1_FOUND OR LIBWPG-0.2_FOUND) endif (PKG_CONFIG_FOUND) endif (LIBWPG_LIBRARIES AND LIBWPG_INCLUDE_DIRS) |