Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 309055 | Differences between
and this patch

Collapse All | Expand All

(-)a/CMakeLists.txt (-1 / +1 lines)
Lines 99-105 option(WITH_PROFILING "Turn on profiling" OFF) # Set to true if compiler/linker Link Here
99 

          99
          

        

        

          100
          
option(ENABLE_POPPLER "Compile with support of libpoppler" ON)

          100
          
option(ENABLE_POPPLER "Compile with support of libpoppler" ON)

        

        

          101
          
option(ENABLE_POPPLER_CAIRO "Compile with support of libpoppler-cairo for rendering PDF preview (depends on ENABLE_POPPLER)" ON)

          101
          
option(ENABLE_POPPLER_CAIRO "Compile with support of libpoppler-cairo for rendering PDF preview (depends on ENABLE_POPPLER)" ON)

        

          
            

              102
              
option(WITH_IMAGE_MAGICK "Compile with support of ImageMagick for raster extensions and image import resolution" ON)


              102
              
option(WITH_IMAGE_MAGICK "Compile with support of ImageMagick for raster extensions and image import resolution" "ImageMagick")

            

        

          103
          
option(WITH_LIBCDR "Compile with support of libcdr for CorelDRAW Diagrams" ON)

          103
          
option(WITH_LIBCDR "Compile with support of libcdr for CorelDRAW Diagrams" ON)

        

        

          104
          
option(WITH_LIBVISIO "Compile with support of libvisio for Microsoft Visio Diagrams" ON)

          104
          
option(WITH_LIBVISIO "Compile with support of libvisio for Microsoft Visio Diagrams" ON)

        

        

          105
          
option(WITH_LIBWPG "Compile with support of libwpg for WordPerfect Graphics" ON)

          105
          
option(WITH_LIBWPG "Compile with support of libwpg for WordPerfect Graphics" ON)

        



(-)a/CMakeScripts/DefineDependsandFlags.cmake
      (-2 / +7 lines)




  

    
      
            Lines 384-390
          list(APPEND INKSCAPE_INCS_SYS ${ZLIB_INCLUDE_DIRS})
      
      
        Link Here
      
    
  

        

          384
          
list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES})

          384
          
list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES})

        

        

          385
          

          385
          

        

        

          386
          
if(WITH_IMAGE_MAGICK)

          386
          
if(WITH_IMAGE_MAGICK)

        

          
            

              387
              
    pkg_check_modules(ImageMagick ImageMagick++ )


              387
              
    pkg_check_modules(${WITH_IMAGE_MAGICK} ${WITH_IMAGE_MAGICK}++ )

            

        

          388
          
    if(ImageMagick_FOUND)

          388
          
    if(ImageMagick_FOUND)

        

        

          389
          

          389
          

        

        

          390
          
        list(APPEND INKSCAPE_LIBS ${ImageMagick_LDFLAGS})

          390
          
        list(APPEND INKSCAPE_LIBS ${ImageMagick_LDFLAGS})

        

  

    
      
            Lines 392-397
          if(WITH_IMAGE_MAGICK)
      
      
        Link Here
      
    
  

        

          392
          

          392
          

        

        

          393
          
        list(APPEND INKSCAPE_INCS_SYS ${ImageMagick_INCLUDE_DIRS})

          393
          
        list(APPEND INKSCAPE_INCS_SYS ${ImageMagick_INCLUDE_DIRS})

        

        

          394
          
        list(APPEND INKSCAPE_LIBS ${ImageMagick_LIBRARIES})

          394
          
        list(APPEND INKSCAPE_LIBS ${ImageMagick_LIBRARIES})

        

            

              
              
              395
              
    elseif(GraphicsMagick_FOUND)

            

            

              396
              
        list(APPEND INKSCAPE_LIBS ${GraphicsMagick_LDFLAGS})

            

            

              397
              
        add_definitions(${GraphicsMagick_CFLAGS_OTHER})

            

            

              398
              

            

            

              399
              
        list(APPEND INKSCAPE_INCS_SYS ${GraphicsMagick_INCLUDE_DIRS})

            

            

              400
              
        list(APPEND INKSCAPE_LIBS ${GraphicsMagick_LIBRARIES})

            

        

          395
          
        else()

          401
          
        else()

        

        

          396
          
	set(WITH_IMAGE_MAGICK OFF)  # enable 'Extensions > Raster'

          402
          
	set(WITH_IMAGE_MAGICK OFF)  # enable 'Extensions > Raster'

        

        

          397
          
    endif()

          403
          
    endif()

        

            

              398
              
- 

              
              
            






  

  Return to bug 309055