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

Collapse All | Expand All

(-)CMakeLists.txt (+45 lines)
Lines 291-314 Link Here
291
    INCLUDE(Find3rdPartyDependencies)
291
    INCLUDE(Find3rdPartyDependencies)
292
ENDIF(WIN32)
292
ENDIF(WIN32)
293
293
294
OPTION(ENABLE_XUL "Enable gecko plugin" ON)
295
OPTION(ENABLE_PDF "Enable pdf plugin" ON)
296
OPTION(ENABLE_XINE "Enable xine plugin" ON)
297
OPTION(ENABLE_JPEG2K "Enable jp2 plugin" ON)
298
OPTION(ENABLE_SVG "Enable svg plugin" ON)
299
OPTION(ENABLE_FREETYPE "Enable freetype plugin" ON)
300
OPTION(ENABLE_CURL "Enable curl plugin" ON)
301
OPTION(ENABLE_GIF "Enable gif plugin" ON)
302
OPTION(ENABLE_JPEG "Enable jpeg plugin" ON)
303
OPTION(ENABLE_PNG "Enable png plugin" ON)
304
OPTION(ENABLE_TIFF "Enable tiff plugin" ON)
305
OPTION(ENABLE_XRANDR "Enable xrandr usage" ON)
306
OPTION(ENABLE_OPENAL "Enable OpenAL usage" ON)
307
OPTION(ENABLE_FFMPEG "Enable FFmpeg usage" ON)
308
294
# Common to all platforms:
309
# Common to all platforms:
310
IF(ENABLE_FREETYPE)
295
FIND_PACKAGE(FreeType)
311
FIND_PACKAGE(FreeType)
312
ENDIF(ENABLE_FREETYPE)
296
FIND_PACKAGE(Inventor)
313
FIND_PACKAGE(Inventor)
314
IF(ENABLE_JPEG2K)
297
FIND_PACKAGE(Jasper)
315
FIND_PACKAGE(Jasper)
316
ENDIF(ENABLE_JPEG2K)
298
FIND_PACKAGE(OpenEXR)
317
FIND_PACKAGE(OpenEXR)
299
FIND_PACKAGE(COLLADA)
318
FIND_PACKAGE(COLLADA)
300
FIND_PACKAGE(FBX)
319
FIND_PACKAGE(FBX)
301
FIND_PACKAGE(ZLIB)
320
FIND_PACKAGE(ZLIB)
321
IF(ENABLE_XINE)
302
FIND_PACKAGE(Xine)
322
FIND_PACKAGE(Xine)
323
ENDIF(ENABLE_XINE)
303
FIND_PACKAGE(OpenVRML)
324
FIND_PACKAGE(OpenVRML)
304
FIND_PACKAGE(Performer)
325
FIND_PACKAGE(Performer)
305
FIND_PACKAGE(GDAL)
326
FIND_PACKAGE(GDAL)
327
IF(ENABLE_CURL)
306
FIND_PACKAGE(CURL)
328
FIND_PACKAGE(CURL)
329
ENDIF(ENABLE_CURL)
307
FIND_PACKAGE(ITK)
330
FIND_PACKAGE(ITK)
308
FIND_PACKAGE(LibVNCServer)
331
FIND_PACKAGE(LibVNCServer)
309
FIND_PACKAGE(OurDCMTK)
332
FIND_PACKAGE(OurDCMTK)
333
IF(ENABLE_OPENAL)
310
FIND_PACKAGE(OpenAL)
334
FIND_PACKAGE(OpenAL)
335
ENDIF(ENABLE_OPENAL)
336
IF(ENABLE_XUL)
311
FIND_PACKAGE(XUL)
337
FIND_PACKAGE(XUL)
338
ENDIF(ENABLE_XUL)
339
IF(ENABLE_FFMPEG)
312
FIND_PACKAGE(FFmpeg)
340
FIND_PACKAGE(FFmpeg)
341
ENDIF(ENABLE_FFMPEG)
313
342
314
#use pkg-config to find various modues
343
#use pkg-config to find various modues
Lines 326-334 Link Here
326
        PKG_CHECK_MODULES(GTKGL gtkglext-x11-1.0)
355
        PKG_CHECK_MODULES(GTKGL gtkglext-x11-1.0)
327
    ENDIF(WIN32)
356
    ENDIF(WIN32)
328
357
358
    IF(ENABLE_SVG)
329
    PKG_CHECK_MODULES(RSVG librsvg-2.0)
359
    PKG_CHECK_MODULES(RSVG librsvg-2.0)
360
    ENDIF(ENABLE_SVG)
330
    PKG_CHECK_MODULES(CAIRO cairo)
361
    PKG_CHECK_MODULES(CAIRO cairo)
362
    IF(ENABLE_PDF)
331
    PKG_CHECK_MODULES(POPPLER poppler-glib)
363
    PKG_CHECK_MODULES(POPPLER poppler-glib)
364
    ENDIF(ENABLE_PDF)
332
365
333
ENDIF(PKG_CONFIG_FOUND)
366
ENDIF(PKG_CONFIG_FOUND)
334
367
Lines 424-433 Link Here
424
# Image readers/writers depend on 3rd party libraries except for OS X which
457
# Image readers/writers depend on 3rd party libraries except for OS X which
425
# can use Quicktime.
458
# can use Quicktime.
426
IF(NOT APPLE)
459
IF(NOT APPLE)
460
    IF(ENABLE_GIF)
427
    FIND_PACKAGE(GIFLIB)
461
    FIND_PACKAGE(GIFLIB)
462
    ENDIF(ENABLE_GIF)
463
    IF(ENABLE_JPEG)
428
    FIND_PACKAGE(JPEG)
464
    FIND_PACKAGE(JPEG)
465
    ENDIF(ENABLE_JPEG)
466
    IF(ENABLE_PNG)
429
    FIND_PACKAGE(PNG)
467
    FIND_PACKAGE(PNG)
468
    ENDIF(ENABLE_PNG)
469
    IF(ENABLE_TIFF)
430
    FIND_PACKAGE(TIFF)
470
    FIND_PACKAGE(TIFF)
471
    ENDIF(ENABLE_TIFF)
431
472
432
    # QuickTime is required for OS X, but optional for Windows.
473
    # QuickTime is required for OS X, but optional for Windows.
433
    IF(WIN32)
474
    IF(WIN32)
Lines 850-852 Link Here
850
  IMMEDIATE @ONLY)
891
  IMMEDIATE @ONLY)
851
ADD_CUSTOM_TARGET(uninstall
892
ADD_CUSTOM_TARGET(uninstall
852
  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
893
  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
894
895
MESSAGE(STATUS "<<< Gentoo configuration >>>
896
Build type: ${CMAKE_BUILD_TYPE}
897
Install path: ${CMAKE_INSTALL_PREFIX}\n")
(-)src/osgViewer/CMakeLists.txt (+2 lines)
Lines 109-115 Link Here
109
            INCLUDE(FindPkgConfig OPTIONAL)
109
            INCLUDE(FindPkgConfig OPTIONAL)
110
            IF (PKG_CONFIG_FOUND)
110
            IF (PKG_CONFIG_FOUND)
111
111
112
		IF(ENABLE_XRANDR)
112
                PKG_CHECK_MODULES(XRANDR xrandr)
113
                PKG_CHECK_MODULES(XRANDR xrandr)
114
		ENDIF(ENABLE_XRANDR)
113
                
115
                
114
                IF (XRANDR_FOUND) 
116
                IF (XRANDR_FOUND) 
115
                    OPTION(OSGVIEWER_USE_XRANDR "Set to ON to enable Xrandr support for GraphicsWindowX11." ON)
117
                    OPTION(OSGVIEWER_USE_XRANDR "Set to ON to enable Xrandr support for GraphicsWindowX11." ON)

Return to bug 316919