Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 22154 → Rev 22155

/trunk/Scribus/.travis.yml
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
/trunk/Scribus/cmake/modules/FindPOPPLER.cmake
1,12 → 1,16
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
14,6 → 18,13
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
)
 
find_library(POPPLER_LIBRARY
NAMES libpoppler poppler
PATHS ${PKG_POPPLER_LIBRARIES} ${POPPLER_LIBRARY_DIRS} /usr/local/lib /usr/lib /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
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)
/trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
2,9 → 2,9
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${POPPLER_INCLUDE_DIR}
${POPPLER_CPP_INCLUDE_DIR}
)
 
 
set(IMPORTPDF_PLUGIN_UI_SRC
pdfimportoptions.ui
)