Author: jghali
Date: Mon Sep 11 18:06:02 2017
New Revision: 22155
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22155
Log:
fix build issue caused by packaging of poppler on Linux
Modified:
trunk/Scribus/.travis.yml
trunk/Scribus/cmake/modules/FindPOPPLER.cmake
trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
Modified: trunk/Scribus/.travis.yml
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22155&path=/trunk/Scribus/.travis.yml
==============================================================================
--- trunk/Scribus/.travis.yml (original)
+++ trunk/Scribus/.travis.yml Mon Sep 11 18:06:02 2017
@@ -31,8 +31,8 @@
libhyphen-dev liblcms2-dev libpodofo-dev libtiff-dev libxml2-dev
python-all-dev zlib1g-dev qt58base qt58declarative
qt58tools libgraphicsmagick++1-dev
- libopenscenegraph-dev libpoppler-dev libcairo2-dev libwpg-dev
libmspub-dev
- libcdr-dev libvisio-dev libharfbuzz-dev libharfbuzz-icu0
+ libopenscenegraph-dev libpoppler-dev libpoppler-cpp-dev libcairo2-dev
libwpg-dev
+ libmspub-dev libcdr-dev libvisio-dev libharfbuzz-dev libharfbuzz-icu0
coreutils binutils python-tk;
fi
# OSX
Modified: trunk/Scribus/cmake/modules/FindPOPPLER.cmake
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22155&path=/trunk/Scribus/cmake/modules/FindPOPPLER.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindPOPPLER.cmake (original)
+++ trunk/Scribus/cmake/modules/FindPOPPLER.cmake Mon Sep 11 18:06:02 2017
@@ -1,15 +1,26 @@
if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
include(UsePkgConfig)
PKGCONFIG(poppler _libPopplerIncDir _libPopplerLinkDir
_libPopplerLinkFlags _libPopplerCflags)
- set(PKG_POPPLER_INCLUDE_DIRS ${_libPopplerIncDir})
- set(PKG_POPPLER_LIBRARIES ${_libPopplerLinkDir})
- else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
- include(FindPkgConfig)
+ set(PKG_POPPLER_INCLUDE_DIRS ${_libPopplerIncDir})
+ set(PKG_POPPLER_LIBRARIES ${_libPopplerLinkDir})
+else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
+ include(FindPkgConfig)
pkg_search_module(POPPLER libpoppler>=0.19.0 poppler>=0.19.0)
- endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
+ if (POPPLER_FOUND)
+ pkg_search_module(POPPLER_CPP REQUIRED libpoppler-cpp>=0.19.0
poppler-cpp>=0.19.0)
+ endif(POPPLER_FOUND)
+endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
+
find_path(POPPLER_INCLUDE_DIR
NAMES poppler-config.h
PATHS ${PKG_POPPLER_INCLUDE_DIRS} ${POPPLER_INCLUDE_DIRS} /usr/local/include
/usr/include
+ PATH_SUFFIXES poppler
+ NO_DEFAULT_PATH
+)
+
+find_path(POPPLER_CPP_INCLUDE_DIR
+ NAMES poppler-version.h
+ PATHS ${PKG_POPPLER_CPP_INCLUDE_DIRS} ${POPPLER_CPP_INCLUDE_DIRS}
/usr/local/include /usr/include
PATH_SUFFIXES poppler
NO_DEFAULT_PATH
)
@@ -20,10 +31,18 @@
PATH_SUFFIXES poppler
NO_DEFAULT_PATH
)
+
+find_library(POPPLER_CPP_LIBRARY
+ NAMES libpoppler-cpp poppler-cpp
+ PATHS ${PKG_POPPLER_CPP_LIBRARIES} ${POPPLER_CPP_LIBRARY_DIRS}
/usr/local/lib /usr/lib /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+ PATH_SUFFIXES poppler
+ NO_DEFAULT_PATH
+)
+
if (POPPLER_LIBRARY)
- if (POPPLER_INCLUDE_DIR)
+ if (POPPLER_INCLUDE_DIR AND POPPLER_CPP_INCLUDE_DIR)
set( FOUND_POPPLER 1 )
- set( POPPLER_LIBRARIES ${POPPLER_LIBRARY} )
- set( POPPLER_INCLUDES ${POPPLER_INCLUDE_DIR})
- endif (POPPLER_INCLUDE_DIR)
+ set( POPPLER_LIBRARIES ${POPPLER_LIBRARY} ${POPPLER_CPP_LIBRARY} )
+ set( POPPLER_INCLUDES ${POPPLER_INCLUDE_DIR} ${POPPLER_CPP_INCLUDE_DIR} )
+ endif (POPPLER_INCLUDE_DIR AND POPPLER_CPP_INCLUDE_DIR)
endif (POPPLER_LIBRARY)
Modified: trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22155&path=/trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt Mon Sep 11
18:06:02 2017
@@ -2,8 +2,8 @@
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${POPPLER_INCLUDE_DIR}
+ ${POPPLER_CPP_INCLUDE_DIR}
)
-
set(IMPORTPDF_PLUGIN_UI_SRC
pdfimportoptions.ui
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
