CMakeLists.txt | 32 +++++++++++++++++++++----------- poppler/Makefile.am | 1 - 2 files changed, 21 insertions(+), 12 deletions(-)
New commits: commit aaeb0d137232bf1cb11dc5e37b8b45b50c6f9c6a Author: Pino Toscano <[email protected]> Date: Fri Dec 12 00:43:19 2008 +0100 update the xpdf headers installation diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f3baf1..248d311 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -251,16 +251,6 @@ install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE if(ENABLE_XPDF_HEADERS) install(FILES - goo/GooHash.h - goo/GooList.h - goo/GooTimer.h - goo/GooMutex.h - goo/GooString.h - goo/GooVector.h - goo/gtypes.h - goo/gmem.h - goo/gfile.h - goo/FixedPoint.h poppler/Annot.h poppler/Array.h poppler/BaseFile.h @@ -287,8 +277,10 @@ if(ENABLE_XPDF_HEADERS) poppler/JBIG2Stream.h poppler/Lexer.h poppler/Link.h + poppler/Movie.h poppler/NameToCharCode.h poppler/Object.h + poppler/OptionalContent.h poppler/Outline.h poppler/OutputDev.h poppler/Page.h @@ -318,9 +310,27 @@ if(ENABLE_XPDF_HEADERS) poppler/UTF8.h poppler/XpdfPluginAPI.h poppler/Sound.h - poppler/Movie.h ${CMAKE_CURRENT_BINARY_DIR}/poppler/poppler-config.h DESTINATION include/poppler) + install(FILES + goo/GooHash.h + goo/GooList.h + goo/GooTimer.h + goo/GooMutex.h + goo/GooString.h + goo/GooVector.h + goo/gtypes.h + goo/gmem.h + goo/gfile.h + goo/FixedPoint.h + DESTINATION include/poppler/goo) + install(FILES + fofi/FoFiBase.h + fofi/FoFiEncodings.h + fofi/FoFiTrueType.h + fofi/FoFiType1.h + fofi/FoFiType1C.h + DESTINATION include/poppler/fofi) if(LIBOPENJPEG_FOUND) install(FILES poppler/JPEG2000Stream.h commit 7c6527fa05389f705872aaaaff12e739b5d1577e Author: Pino Toscano <[email protected]> Date: Fri Dec 12 00:41:21 2008 +0100 don't install Function.cc, as it is not an header diff --git a/poppler/Makefile.am b/poppler/Makefile.am index db9fd74..5d22918 100644 --- a/poppler/Makefile.am +++ b/poppler/Makefile.am @@ -159,7 +159,6 @@ poppler_include_HEADERS = \ FontEncodingTables.h \ FontInfo.h \ Form.h \ - Function.cc \ Function.h \ Gfx.h \ GfxFont.h \ _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
