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

(-)../OpenSceneGraph-2.8.3/CMakeLists.txt (-35 / +43 lines)
Lines 27-32 Link Here
27
endif(COMMAND cmake_policy)
27
endif(COMMAND cmake_policy)
28
28
29
PROJECT(OpenSceneGraph)
29
PROJECT(OpenSceneGraph)
30
30
31
31
SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
32
SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
32
SET(OPENSCENEGRAPH_MINOR_VERSION 8)
33
SET(OPENSCENEGRAPH_MINOR_VERSION 8)
Lines 276-281 Link Here
276
# INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
277
# INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
277
278
278
279
280
INCLUDE(MacroOptionalFindPackage)
279
################################################################################
281
################################################################################
280
# Optional build components
282
# Optional build components
281
283
Lines 292-315 Link Here
292
ENDIF(WIN32)
294
ENDIF(WIN32)
293
295
294
# Common to all platforms:
296
# Common to all platforms:
295
FIND_PACKAGE(FreeType)
297
MACRO_OPTIONAL_FIND_PACKAGE(FreeType)
296
FIND_PACKAGE(Inventor)
298
MACRO_OPTIONAL_FIND_PACKAGE(Inventor)
297
FIND_PACKAGE(Jasper)
299
MACRO_OPTIONAL_FIND_PACKAGE(Jasper)
298
FIND_PACKAGE(OpenEXR)
300
MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR)
299
FIND_PACKAGE(COLLADA)
301
MACRO_OPTIONAL_FIND_PACKAGE(COLLADA)
300
FIND_PACKAGE(FBX)
302
MACRO_OPTIONAL_FIND_PACKAGE(FBX)
301
FIND_PACKAGE(ZLIB)
303
MACRO_OPTIONAL_FIND_PACKAGE(ZLIB)
302
FIND_PACKAGE(Xine)
304
MACRO_OPTIONAL_FIND_PACKAGE(Xine)
303
FIND_PACKAGE(OpenVRML)
305
MACRO_OPTIONAL_FIND_PACKAGE(OpenVRML)
304
FIND_PACKAGE(Performer)
306
MACRO_OPTIONAL_FIND_PACKAGE(Performer)
305
FIND_PACKAGE(GDAL)
307
MACRO_OPTIONAL_FIND_PACKAGE(GDAL)
306
FIND_PACKAGE(CURL)
308
MACRO_OPTIONAL_FIND_PACKAGE(CURL)
307
FIND_PACKAGE(ITK)
309
MACRO_OPTIONAL_FIND_PACKAGE(ITK)
308
FIND_PACKAGE(LibVNCServer)
310
MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer)
309
FIND_PACKAGE(OurDCMTK)
311
MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK)
310
FIND_PACKAGE(OpenAL)
312
MACRO_OPTIONAL_FIND_PACKAGE(OpenAL)
311
FIND_PACKAGE(XUL)
313
MACRO_OPTIONAL_FIND_PACKAGE(XUL)
312
FIND_PACKAGE(FFmpeg)
314
MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg)
313
315
314
#use pkg-config to find various modues
316
#use pkg-config to find various modues
315
INCLUDE(FindPkgConfig OPTIONAL)
317
INCLUDE(FindPkgConfig OPTIONAL)
Lines 318-323 Link Here
318
320
319
    INCLUDE(FindPkgConfig)
321
    INCLUDE(FindPkgConfig)
320
322
323
    IF(WITH_GTK)
321
    PKG_CHECK_MODULES(GTK gtk+-2.0)
324
    PKG_CHECK_MODULES(GTK gtk+-2.0)
322
325
323
    IF(WIN32)
326
    IF(WIN32)
Lines 325-334 Link Here
325
    ELSE(WIN32)
328
    ELSE(WIN32)
326
        PKG_CHECK_MODULES(GTKGL gtkglext-x11-1.0)
329
        PKG_CHECK_MODULES(GTKGL gtkglext-x11-1.0)
327
    ENDIF(WIN32)
330
    ENDIF(WIN32)
331
    ENDIF(WITH_GTK)
328
332
329
    PKG_CHECK_MODULES(RSVG librsvg-2.0)
333
    IF(WITH_SVG)
334
        PKG_CHECK_MODULES(RSVG librsvg-2.0)
335
    ENDIF(WITH_SVG)
330
    PKG_CHECK_MODULES(CAIRO cairo)
336
    PKG_CHECK_MODULES(CAIRO cairo)
331
    PKG_CHECK_MODULES(POPPLER poppler-glib)
337
    IF(WITH_PDF)
338
        PKG_CHECK_MODULES(POPPLER poppler-glib)
339
    ENDIF(WITH_PDF)
332
340
333
ENDIF(PKG_CONFIG_FOUND)
341
ENDIF(PKG_CONFIG_FOUND)
334
342
Lines 336-365 Link Here
336
IF   (BUILD_OSG_EXAMPLES)
344
IF   (BUILD_OSG_EXAMPLES)
337
345
338
346
339
    FIND_PACKAGE(FLTK)
347
    MACRO_OPTIONAL_FIND_PACKAGE(FLTK)
340
    FIND_PACKAGE(GLUT)
348
    MACRO_OPTIONAL_FIND_PACKAGE(GLUT)
341
    FIND_PACKAGE(SDL)
349
    MACRO_OPTIONAL_FIND_PACKAGE(SDL)
342
    FIND_PACKAGE(FOX)
350
    MACRO_OPTIONAL_FIND_PACKAGE(FOX)
343
351
344
    SET(wxWidgets_USE_LIBS base core gl net)
352
    SET(wxWidgets_USE_LIBS base core gl net)
345
    FIND_PACKAGE(wxWidgets)
353
    MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets)
346
354
347
    # To select a specific version of QT define DESIRED_QT_VERSION
355
    # To select a specific version of QT define DESIRED_QT_VERSION
348
    # via cmake -DDESIRED_QT_VERSION=4
356
    # via cmake -DDESIRED_QT_VERSION=4
349
    IF  (DESIRED_QT_VERSION)
357
    IF  (DESIRED_QT_VERSION)
350
358
351
        IF  (DESIRED_QT_VERSION MATCHES 4)
359
        IF  (DESIRED_QT_VERSION MATCHES 4)
352
          FIND_PACKAGE(Qt4)
360
          MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
353
        ELSE(DESIRED_QT_VERSION MATCHES 4)
361
        ELSE(DESIRED_QT_VERSION MATCHES 4)
354
          FIND_PACKAGE(Qt3)
362
          MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
355
        ENDIF(DESIRED_QT_VERSION MATCHES 4)
363
        ENDIF(DESIRED_QT_VERSION MATCHES 4)
356
364
357
    ELSE(DESIRED_QT_VERSION)
365
    ELSE(DESIRED_QT_VERSION)
358
366
359
        FIND_PACKAGE(Qt4)
367
        MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
360
368
361
        IF  (NOT QT4_FOUND)
369
        IF  (NOT QT4_FOUND)
362
            FIND_PACKAGE(Qt3)
370
            MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
363
        ENDIF(NOT QT4_FOUND)
371
        ENDIF(NOT QT4_FOUND)
364
372
365
    ENDIF(DESIRED_QT_VERSION)
373
    ENDIF(DESIRED_QT_VERSION)
Lines 424-433 Link Here
424
# Image readers/writers depend on 3rd party libraries except for OS X which
432
# Image readers/writers depend on 3rd party libraries except for OS X which
425
# can use Quicktime.
433
# can use Quicktime.
426
IF(NOT APPLE)
434
IF(NOT APPLE)
427
    FIND_PACKAGE(GIFLIB)
435
    MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB)
428
    FIND_PACKAGE(JPEG)
436
    MACRO_OPTIONAL_FIND_PACKAGE(JPEG)
429
    FIND_PACKAGE(PNG)
437
    MACRO_OPTIONAL_FIND_PACKAGE(PNG)
430
    FIND_PACKAGE(TIFF)
438
    MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
431
439
432
    # QuickTime is required for OS X, but optional for Windows.
440
    # QuickTime is required for OS X, but optional for Windows.
433
    IF(WIN32)
441
    IF(WIN32)
Lines 722-728 Link Here
722
        ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
730
        ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
723
    )
731
    )
724
    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
732
    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
725
    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
733
    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openscenegraph-doc)
726
734
727
    # now set up openthreads documentation generation
735
    # now set up openthreads documentation generation
728
    IF(BUILD_REF_DOCS_TAGFILE)
736
    IF(BUILD_REF_DOCS_TAGFILE)
Lines 738-744 Link Here
738
        ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
746
        ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
739
    )
747
    )
740
    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
748
    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
741
    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
749
    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openthreads-doc)
742
750
743
    # Process our other doxyfiles but don't create targets for these
751
    # Process our other doxyfiles but don't create targets for these
744
    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
752
    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
(-)../OpenSceneGraph-2.8.3/CMakeModules/FindFLTK.cmake (-60 lines)
Lines 1-60 Link Here
1
# Locate gdal
2
# This module defines
3
# FLTK_LIBRARY
4
# FLTK_FOUND, if false, do not try to link to gdal 
5
# FLTK_INCLUDE_DIR, where to find the headers
6
#
7
# $FLTK_DIR is an environment variable that would
8
# correspond to the ./configure --prefix=$FLTK_DIR
9
#
10
# Created by Robert Osfield. 
11
12
FIND_PATH(FLTK_INCLUDE_DIR Fl/Fl.H Fl/Fl.h
13
    $ENV{FLTK_DIR}/include
14
    $ENV{FLTK_DIR}
15
    $ENV{OSGDIR}/include
16
    $ENV{OSGDIR}
17
    $ENV{OSG_ROOT}/include
18
    ~/Library/Frameworks
19
    /Library/Frameworks
20
    /usr/local/include
21
    /usr/include
22
    /sw/include # Fink
23
    /opt/local/include # DarwinPorts
24
    /opt/csw/include # Blastwave
25
    /opt/include
26
    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
27
    /usr/freeware/include
28
)
29
30
MACRO(FIND_FLTK_LIBRARY MYLIBRARY MYLIBRARYNAME)
31
32
    FIND_LIBRARY(${MYLIBRARY}
33
        NAMES ${MYLIBRARYNAME}
34
        PATHS
35
        $ENV{FLTK_DIR}/lib
36
        $ENV{FLTK_DIR}
37
        $ENV{OSGDIR}/lib
38
        $ENV{OSGDIR}
39
        $ENV{OSG_ROOT}/lib
40
        ~/Library/Frameworks
41
        /Library/Frameworks
42
        /usr/local/lib
43
        /usr/lib
44
        /sw/lib
45
        /opt/local/lib
46
        /opt/csw/lib
47
        /opt/lib
48
        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
49
        /usr/freeware/lib64
50
    )
51
52
ENDMACRO(FIND_FLTK_LIBRARY LIBRARY LIBRARYNAME)
53
54
FIND_FLTK_LIBRARY(FLTK_LIBRARY fltk)
55
FIND_FLTK_LIBRARY(FLTK_GL_LIBRARY fltk_gl)
56
57
SET(FLTK_FOUND "NO")
58
IF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
59
    SET(FLTK_FOUND "YES")
60
ENDIF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
(-)../OpenSceneGraph-2.8.3/CMakeModules/MacroOptionalFindPackage.cmake (+28 lines)
Line 0 Link Here
1
# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
2
# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
3
# This macro is a combination of OPTION() and FIND_PACKAGE(), it
4
# works like FIND_PACKAGE(), but additionally it automatically creates
5
# an option name WITH_<name>, which can be disabled via the cmake GUI.
6
# or via -DWITH_<name>=OFF
7
# The standard <name>_FOUND variables can be used in the same way
8
# as when using the normal FIND_PACKAGE()
9
10
# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
11
#
12
# Redistribution and use is allowed according to the terms of the BSD license.
13
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
14
15
16
macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
17
   option(WITH_${_name} "Search for ${_name} package" ON)
18
   if (WITH_${_name})
19
      find_package(${_name} ${ARGN})
20
   else (WITH_${_name})
21
      set(${_name}_FOUND)
22
      set(${_name}_INCLUDE_DIR)
23
      set(${_name}_INCLUDES)
24
      set(${_name}_LIBRARY)
25
      set(${_name}_LIBRARIES)
26
   endif (WITH_${_name})
27
endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
28
(-)../OpenSceneGraph-2.8.3/CMakeModules/OsgMacroUtils.cmake (-2 / +2 lines)
Lines 305-313 Link Here
305
        SETUP_EXE(${IS_COMMANDLINE_APP})
305
        SETUP_EXE(${IS_COMMANDLINE_APP})
306
        
306
        
307
        IF(APPLE)
307
        IF(APPLE)
308
            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )            
308
            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin BUNDLE DESTINATION bin)
309
        ELSE(APPLE)
309
        ELSE(APPLE)
310
            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
310
            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
311
        ENDIF(APPLE)
311
        ENDIF(APPLE)
312
312
313
ENDMACRO(SETUP_EXAMPLE)
313
ENDMACRO(SETUP_EXAMPLE)
(-)../OpenSceneGraph-2.8.3/examples/osgviewerFLTK/CMakeLists.txt (-1 / +1 lines)
Lines 1-6 Link Here
1
SET(TARGET_SRC osgviewerFLTK.cpp )
1
SET(TARGET_SRC osgviewerFLTK.cpp )
2
2
3
SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_LIBRARY} ${FLTK_GL_LIBRARY})
3
SET(TARGET_EXTERNAL_LIBRARIES ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY})
4
4
5
INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} )
5
INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} )
6
6

Return to bug 316919