Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 279111
Collapse All | Expand All

(-)CMakeLists.txt.old (-9 / +16 lines)
Lines 328-342 Link Here
328
ENDIF(NOT RENDER_LIB OR OLDRENDERLIBLOST)
328
ENDIF(NOT RENDER_LIB OR OLDRENDERLIBLOST)
329
329
330
330
331
# START CUPS
331
# START CUPS (TDX : CUPS is now optionnal)
332
SET(CUPS_DIR ${CMAKE_MODULE_PATH})
332
IF (WANT_CUPS)
333
FIND_PACKAGE(CUPS REQUIRED)
333
  SET(CUPS_DIR ${CMAKE_MODULE_PATH})
334
IF(CUPS_FOUND)
334
  FIND_PACKAGE(CUPS REQUIRED)
335
  SET(HAVE_CUPS 1)
335
  IF(CUPS_FOUND)
336
  MESSAGE("CUPS Library Found OK")
336
    SET(HAVE_CUPS 1)
337
ENDIF(CUPS_FOUND)
337
    MESSAGE("CUPS Library Found OK")
338
    ENDIF(CUPS_FOUND)
339
ENDIF (WANT_CUPS)
338
# END CUPS
340
# END CUPS
339
341
342
340
# START LIBXML2
343
# START LIBXML2
341
SET(LIBXML2_DIR ${CMAKE_MODULE_PATH})
344
SET(LIBXML2_DIR ${CMAKE_MODULE_PATH})
342
FIND_PACKAGE(LIBXML2 REQUIRED)
345
FIND_PACKAGE(LIBXML2 REQUIRED)
Lines 414-420 Link Here
414
${CMAKE_BINARY_DIR}/scribus
417
${CMAKE_BINARY_DIR}/scribus
415
${QT_INCLUDE_DIR}
418
${QT_INCLUDE_DIR}
416
${QT_INCLUDE_PATH}
419
${QT_INCLUDE_PATH}
417
${CUPS_INCLUDE_DIR}
418
${FREETYPE_INCLUDE_DIR}
420
${FREETYPE_INCLUDE_DIR}
419
${FONTCONFIG_INCLUDE_DIR}
421
${FONTCONFIG_INCLUDE_DIR}
420
${LCMS_INCLUDE_DIR}
422
${LCMS_INCLUDE_DIR}
Lines 429-434 Link Here
429
431
430
#Set up libraries to link with all found packages
432
#Set up libraries to link with all found packages
431
433
434
#TDX : CUPS is now optionnal
435
IF(WANT_CUPS)
436
  INCLUDE_DIRECTORIES(${CUPS_INCLUDE_DIR})
437
  LINK_LIBRARIES(${CUPS_LIBRARIES})
438
ENDIF(WANT_CUPS)
439
432
#Select Libart_LGPL or Cairo
440
#Select Libart_LGPL or Cairo
433
IF(RENDER_LIB STREQUAL "LIBART")
441
IF(RENDER_LIB STREQUAL "LIBART")
434
  INCLUDE_DIRECTORIES(${LIBART_LGPL_INCLUDE_DIR})
442
  INCLUDE_DIRECTORIES(${LIBART_LGPL_INCLUDE_DIR})
Lines 445-451 Link Here
445
453
446
LINK_LIBRARIES (
454
LINK_LIBRARIES (
447
${QT_QT_LIBRARY}
455
${QT_QT_LIBRARY}
448
${CUPS_LIBRARIES}
449
${FREETYPE_LIBRARIES}
456
${FREETYPE_LIBRARIES}
450
${FONTCONFIG_LIBRARIES}
457
${FONTCONFIG_LIBRARIES}
451
${LCMS_LIBRARIES}
458
${LCMS_LIBRARIES}

Return to bug 279111