Ignore:
Timestamp:
2018-07-09T21:14:55+12:00 (6 years ago)
Author:
ak19
Message:

All the changes to incorporate libtiff and libjpeg into the xpdftools GS2 extension, to get libjpeg compiled up on 64 bit machines, and for both libs to be seen and used by xpdftools when this is built.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • gs2-extensions/xpdf-tools/trunk/src/packages/gs-CMakeLists.txt

    r32248 r32249  
    3232else ()
    3333  message(STATUS "@@@@ GSDLFLAG_STATIC not SET. Building dynamically using xpdf-tools' (mostly) original, unmodified linker flags.")
     34endif ()
     35if (JPEG_FOUND)
     36  include_directories("${JPEG_INCLUDE_DIR}")
     37  add_definitions("${JPEG_DEFINITIONS}")
     38  message(STATUS "@@@@@@@@@@@@@@@ JPEG_FOUND (include_dir ; include_dirs): ${JPEG_INCLUDE_DIR} ; ${JPEG_INCLUDE_DIRS}")
     39else ()
     40  message(STATUS "@@@@@@@@@@@@@@@ NO JPEG_FOUND")
     41endif ()
     42if (TIFF_FOUND)
     43  include_directories("${TIFF_INCLUDE_DIRS}")
     44  add_definitions("${TIFF_DEFINITIONS}")
     45  message(STATUS "@@@@@@@@@@@@@@@ TIFF_FOUND ${TIFF_INCLUDE_DIRS}")
     46else ()
     47  message(STATUS "@@@@@@@@@@@@@@@ NO TIFF_FOUND")
    3448endif ()
    3549if (PNG_FOUND)
    … …  
    145159  if(GSDLFLAG_STATIC)
    146160    target_link_libraries(pdftops goo fofi splash
    147       ${GSDLFLAG_STATIC} -lfreetype ${DTYPE_LIBRARY} ${LCMS_LIBRARY} -lz -lm -lc -lpthread)
     161      ${GSDLFLAG_STATIC} -lfreetype ${DTYPE_LIBRARY} ${LCMS_LIBRARY} -ltiff -ljpeg -lz -lm -lc -lpthread)
    148162    # Threads::Threads instead of -lpthread results in a partially dynamic executable
    149163  else ()
    … …  
    152166                        ${DTYPE_LIBRARY}
    153167                        ${LCMS_LIBRARY}
     168            ${TIFF_LIBRARY} ${JPEG_LIBRARY}
    154169            ${ZLIB_LIBRARIES})
    155170  endif ()
    … …  
    162177  )
    163178  if(GSDLFLAG_STATIC)
    164     target_link_libraries(pdftops goo fofi ${GSDLFLAG_STATIC} ${LCMS_LIBRARY} -lm -lc -lpthread)
    165   else ()
    166     target_link_libraries(pdftops goo fofi ${LCMS_LIBRARY})
     179    target_link_libraries(pdftops goo fofi ${GSDLFLAG_STATIC} ${LCMS_LIBRARY} -ltiff -ljpeg -lm -lc -lpthread)
     180  else ()
     181    target_link_libraries(pdftops goo fofi ${LCMS_LIBRARY} ${TIFF_LIBRARY} ${JPEG_LIBRARY})
    167182  endif ()
    168183endif ()
    … …  
    178193)
    179194if(GSDLFLAG_STATIC)
    180   target_link_libraries(pdftotext goo fofi ${GSDLFLAG_STATIC} ${LCMS_LIBRARY} -lpthread)
     195  target_link_libraries(pdftotext goo fofi ${GSDLFLAG_STATIC} ${LCMS_LIBRARY} -ltiff -ljpeg -lpthread)
    181196  # Threads::Threads instead of -lpthread results in a partially dynamic executable
    182197else ()
    183   target_link_libraries(pdftotext goo fofi ${LCMS_LIBRARY})
     198  target_link_libraries(pdftotext goo fofi ${LCMS_LIBRARY} ${TIFF_LIBRARY} ${JPEG_LIBRARY})
    184199endif ()
    185200install(TARGETS pdftotext RUNTIME DESTINATION bin)
    … …  
    198213  if(GSDLFLAG_STATIC)
    199214    target_link_libraries(pdftohtml goo fofi splash
    200       ${GSDLFLAG_STATIC} -lfreetype ${DTYPE_LIBRARY} ${LCMS_LIBRARY} -lpng -lz -lm -lc -lpthread)
     215      ${GSDLFLAG_STATIC} -lfreetype ${DTYPE_LIBRARY} ${LCMS_LIBRARY} -ltiff -ljpeg -lpng -lz -lm -lc -lpthread)
    201216  else ()
    202217    target_link_libraries(pdftohtml goo fofi splash
    203218                          ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
    204219                          ${DTYPE_LIBRARY}
    205                           ${LCMS_LIBRARY} ${PNG_LIBRARIES})
     220                          ${LCMS_LIBRARY}
     221              ${TIFF_LIBRARY} ${JPEG_LIBRARY}
     222              ${PNG_LIBRARIES})
    206223  endif ()
    207224  install(TARGETS pdftohtml RUNTIME DESTINATION bin)
    … …  
    216233)
    217234if(GSDLFLAG_STATIC)
    218   target_link_libraries(pdfinfo goo fofi ${GSDLFLAG_STATIC} ${LCMS_LIBRARY} -lpthread)
    219 else ()
    220   target_link_libraries(pdfinfo goo fofi ${LCMS_LIBRARY})
     235  target_link_libraries(pdfinfo goo fofi ${GSDLFLAG_STATIC} ${LCMS_LIBRARY} -ltiff -ljpeg -lpthread)
     236else ()
     237  target_link_libraries(pdfinfo goo fofi ${LCMS_LIBRARY} ${TIFF_LIBRARY} ${JPEG_LIBRARY})
    221238endif()
    222239install(TARGETS pdfinfo RUNTIME DESTINATION bin)
    … …  
    230247)
    231248if(GSDLFLAG_STATIC)
    232   target_link_libraries(pdffonts goo fofi ${GSDLFLAG_STATIC} ${LCMS_LIBRARY} -lpthread)
    233 else ()
    234   target_link_libraries(pdffonts goo fofi ${LCMS_LIBRARY})
     249  target_link_libraries(pdffonts goo fofi ${GSDLFLAG_STATIC} ${LCMS_LIBRARY} -ltiff -ljpeg -lpthread)
     250else ()
     251  target_link_libraries(pdffonts goo fofi ${LCMS_LIBRARY} ${TIFF_LIBRARY} ${JPEG_LIBRARY})
    235252endif ()
    236253install(TARGETS pdffonts RUNTIME DESTINATION bin)
    … …  
    244261)
    245262if(GSDLFLAG_STATIC)
    246   target_link_libraries(pdfdetach goo fofi ${GSDLFLAG_STATIC} ${LCMS_LIBRARY} -lpthread)
    247 else ()
    248   target_link_libraries(pdfdetach goo fofi ${LCMS_LIBRARY})
     263  target_link_libraries(pdfdetach goo fofi ${GSDLFLAG_STATIC} ${LCMS_LIBRARY} -ltiff -ljpeg -lpthread)
     264else ()
     265  target_link_libraries(pdfdetach goo fofi ${LCMS_LIBRARY} ${TIFF_LIBRARY} ${JPEG_LIBRARY})
    249266endif ()
    250267install(TARGETS pdfdetach RUNTIME DESTINATION bin)
    … …  
    261278  if(GSDLFLAG_STATIC)
    262279    target_link_libraries(pdftoppm goo fofi splash
    263       ${GSDLFLAG_STATIC} -lfreetype ${DTYPE_LIBRARY} ${LCMS_LIBRARY} -lz -lm -lc -lpthread)
     280      ${GSDLFLAG_STATIC} -lfreetype ${DTYPE_LIBRARY} ${LCMS_LIBRARY} -ltiff -ljpeg -lz -lm -lc -lpthread)
    264281  else ()
    265282    target_link_libraries(pdftoppm goo fofi splash
    … …  
    267284                        ${DTYPE_LIBRARY}
    268285                        ${LCMS_LIBRARY}
     286            ${TIFF_LIBRARY} ${JPEG_LIBRARY}
    269287            ${ZLIB_LIBRARIES})
    270288  endif ()
    … …  
    283301  if(GSDLFLAG_STATIC)
    284302    target_link_libraries(pdftopng goo fofi splash
    285       ${GSDLFLAG_STATIC} -lfreetype ${DTYPE_LIBRARY} ${LCMS_LIBRARY} -lpng -lz -lm -lc -lpthread)
     303      ${GSDLFLAG_STATIC} -lfreetype ${DTYPE_LIBRARY} ${LCMS_LIBRARY} -ltiff -ljpeg -lpng -lz -lm -lc -lpthread)
    286304  else ()
    287305    target_link_libraries(pdftopng goo fofi splash
    288306                        ${FREETYPE_LIBRARY} ${FREETYPE_OTHER_LIBS}
    289307                        ${DTYPE_LIBRARY}
     308            ${TIFF_LIBRARY} ${JPEG_LIBRARY}
    290309                        ${LCMS_LIBRARY} ${PNG_LIBRARIES})
    291310  endif ()
    … …  
    302321)
    303322if(GSDLFLAG_STATIC)
    304   target_link_libraries(pdfimages goo fofi ${GSDLFLAG_STATIC} ${LCMS_LIBRARY} -lpthread)
    305 else ()
    306   target_link_libraries(pdfimages goo fofi ${LCMS_LIBRARY})
     323  target_link_libraries(pdfimages goo fofi ${GSDLFLAG_STATIC} ${LCMS_LIBRARY} -ltiff -ljpeg -lpthread)
     324else ()
     325  target_link_libraries(pdfimages goo fofi ${LCMS_LIBRARY} ${TIFF_LIBRARY} ${JPEG_LIBRARY})
    307326endif ()
    308327install(TARGETS pdfimages RUNTIME DESTINATION bin)
Note: See TracChangeset for help on using the changeset viewer.