1
0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-10-05 19:41:40 +00:00

Merge branch 'master' into devv

This commit is contained in:
Lu Wang 2012-09-16 12:41:16 +08:00
commit d8d0bb026d

View File

@ -8,6 +8,12 @@ pkg_check_modules(POPPLER REQUIRED poppler>=0.20.0)
include_directories(${POPPLER_INCLUDE_DIRS}) include_directories(${POPPLER_INCLUDE_DIRS})
link_directories(${POPPLER_LIBRARY_DIRS}) link_directories(${POPPLER_LIBRARY_DIRS})
# fontforge starts using pkg-config 'correctly' since 2.0.0
pkg_check_modules(FONTFORGE libfontforge>=2.0.0)
if(FONTFORGE_FOUND)
include_directories(${FONTFORGE_INCLUDE_DIRS})
link_directories(${FONTFORGE_LIBRARY_DIRS})
else()
find_path(FF_INCLUDE_PATH fontforge/fontforge.h) find_path(FF_INCLUDE_PATH fontforge/fontforge.h)
if(FF_INCLUDE_PATH) if(FF_INCLUDE_PATH)
message("Found fontforge.h: ${FF_INCLUDE_PATH}/fontforge/fontforge.h") message("Found fontforge.h: ${FF_INCLUDE_PATH}/fontforge/fontforge.h")
@ -51,6 +57,9 @@ endif()
message("Looking for libraries of python, which is required by fontforge, if you can link fontforge without python, you may disable this") message("Looking for libraries of python, which is required by fontforge, if you can link fontforge without python, you may disable this")
pkg_search_module(PYTHON python python-2.7) pkg_search_module(PYTHON python python-2.7)
endif()
set(PDF2HTMLEX_VERSION "0.3") set(PDF2HTMLEX_VERSION "0.3")
set(ARCHIVE_NAME pdf2htmlex-${PDF2HTMLEX_VERSION}) set(ARCHIVE_NAME pdf2htmlex-${PDF2HTMLEX_VERSION})