office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-07-17 02:37:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup and simplify

Browse source 
svn path=/trunk/KDE/kdegraphics/cmake/modules/; revision=747341
This commit is contained in:
Pino Toscano 2007-12-11 18:55:00 +00:00
parent fb2a432097
commit 0f8848077e
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmake/modules/FindPoppler.cmake
View file

@ -41,14 +41,13 @@ else(_PopplerLinkFlags)
find_path( INCLUDEPOPPLER poppler-qt4.h PATHS ${INCLUDEPOPPLERQT4}/qt4 )
if( LIBPOPPLER_QT4 AND LIBPOPPLER AND INCLUDEPOPPLER )
set( POPPLER_FOUND TRUE )
set(_PopplerLinkFlags ${LIBPOPPLER} ${LIBPOPPLER_QT4})
set(POPPLER_INCLUDE_DIR ${INCLUDEPOPPLER})
endif( LIBPOPPLER_QT4 AND LIBPOPPLER AND INCLUDEPOPPLER )
endif(_PopplerLinkFlags)
if (POPPLER_FOUND)
set(POPPLER_LIBRARY ${_PopplerLinkFlags})
if( LIBPOPPLER AND LIBPOPPLER_QT4 )
set( POPPLER_LIBRARY ${LIBPOPPLER} ${LIBPOPPLER_QT4} )
endif( LIBPOPPLER AND LIBPOPPLER_QT4 )
# the cflags for poppler-qt4 can contain more than one include path
separate_arguments(_PopplerCflags)
@ -56,9 +55,6 @@ if (POPPLER_FOUND)
string(REGEX REPLACE "-I(.+)" "\\1" _includedir "${_includedir}")
set(POPPLER_INCLUDE_DIR ${POPPLER_INCLUDE_DIR} ${_includedir})
endforeach(_includedir)
if( INCLUDEPOPPLER )
set( POPPLER_INCLUDE_DIR ${INCLUDEPOPPLER} )
endif( INCLUDEPOPPLER )
# check whether we're using poppler 0.6
set(CMAKE_REQUIRED_INCLUDES ${POPPLER_INCLUDE_DIR} ${QT_INCLUDE_DIR})