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

Collapse All | Expand All

(-)OpenSceneGraph-3.0.1/CMakeLists.txt (-45 / +38 lines)
Lines 421-426 Link Here
421
421
422
# INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
422
# INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
423
423
424
INCLUDE(MacroOptionalFindPackage)
424
425
425
################################################################################
426
################################################################################
426
# Set Version Info resource file
427
# Set Version Info resource file
Lines 450-479 Link Here
450
    ANDROID_3RD_PARTY()
451
    ANDROID_3RD_PARTY()
451
ELSE()
452
ELSE()
452
# Common to all platforms except android:
453
# Common to all platforms except android:
453
    FIND_PACKAGE(FreeType)
454
MACRO_OPTIONAL_FIND_PACKAGE(FreeType)
454
    FIND_PACKAGE(Inventor)
455
MACRO_OPTIONAL_FIND_PACKAGE(Inventor)
455
    FIND_PACKAGE(Jasper)
456
MACRO_OPTIONAL_FIND_PACKAGE(Jasper)
456
    FIND_PACKAGE(OpenEXR)
457
MACRO_OPTIONAL_FIND_PACKAGE(OpenEXR)
457
    FIND_PACKAGE(COLLADA)
458
MACRO_OPTIONAL_FIND_PACKAGE(COLLADA)
458
    FIND_PACKAGE(FBX)
459
MACRO_OPTIONAL_FIND_PACKAGE(FBX)
459
    FIND_PACKAGE(ZLIB)
460
MACRO_OPTIONAL_FIND_PACKAGE(ZLIB)
460
    FIND_PACKAGE(Xine)
461
MACRO_OPTIONAL_FIND_PACKAGE(Xine)
461
    FIND_PACKAGE(OpenVRML)
462
MACRO_OPTIONAL_FIND_PACKAGE(OpenVRML)
462
    FIND_PACKAGE(Performer)
463
MACRO_OPTIONAL_FIND_PACKAGE(Performer)
463
    FIND_PACKAGE(GDAL)
464
MACRO_OPTIONAL_FIND_PACKAGE(GDAL)
464
    FIND_PACKAGE(CURL)
465
MACRO_OPTIONAL_FIND_PACKAGE(CURL)
465
    FIND_PACKAGE(ITK)
466
MACRO_OPTIONAL_FIND_PACKAGE(ITK)
466
    FIND_PACKAGE(LibVNCServer)
467
MACRO_OPTIONAL_FIND_PACKAGE(LibVNCServer)
467
    FIND_PACKAGE(OurDCMTK)
468
MACRO_OPTIONAL_FIND_PACKAGE(OurDCMTK)
468
    FIND_PACKAGE(OpenAL)
469
MACRO_OPTIONAL_FIND_PACKAGE(OpenAL)
469
    FIND_PACKAGE(FFmpeg)
470
MACRO_OPTIONAL_FIND_PACKAGE(FFmpeg)
470
    FIND_PACKAGE(DirectShow)
471
    FIND_PACKAGE(DirectShow)
471
    FIND_PACKAGE(SDL)
472
MACRO_OPTIONAL_FIND_PACKAGE(SDL)
472
    FIND_PACKAGE(Poppler-glib)
473
MACRO_OPTIONAL_FIND_PACKAGE(Poppler-glib)
473
    FIND_PACKAGE(RSVG)
474
MACRO_OPTIONAL_FIND_PACKAGE(RSVG)
474
    FIND_PACKAGE(GtkGl)
475
MACRO_OPTIONAL_FIND_PACKAGE(GtkGl)
475
    FIND_PACKAGE(DirectInput)
476
    FIND_PACKAGE(DirectInput)
476
    FIND_PACKAGE(NVTT)
477
MACRO_OPTIONAL_FIND_PACKAGE(NVTT)
477
ENDIF()
478
ENDIF()
478
479
479
# Include macro utilities here
480
# Include macro utilities here
Lines 485-501 Link Here
485
    IF  (DESIRED_QT_VERSION)
486
    IF  (DESIRED_QT_VERSION)
486
487
487
        IF  (DESIRED_QT_VERSION MATCHES 4)
488
        IF  (DESIRED_QT_VERSION MATCHES 4)
488
              FIND_PACKAGE(Qt4)
489
              MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
489
        ELSE()
490
        ELSE()
490
              FIND_PACKAGE(Qt3)
491
              MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
491
        ENDIF()
492
        ENDIF()
492
493
493
    ELSE()
494
    ELSE()
494
495
495
        FIND_PACKAGE(Qt4)
496
        MACRO_OPTIONAL_FIND_PACKAGE(Qt4)
496
497
497
        IF  (NOT QT4_FOUND)
498
        IF  (NOT QT4_FOUND)
498
            FIND_PACKAGE(Qt3)
499
            MACRO_OPTIONAL_FIND_PACKAGE(Qt3)
499
        ENDIF()
500
        ENDIF()
500
501
501
    ENDIF()
502
    ENDIF()
Lines 504-515 Link Here
504
IF   (BUILD_OSG_EXAMPLES AND NOT ANDROID)
505
IF   (BUILD_OSG_EXAMPLES AND NOT ANDROID)
505
506
506
507
507
    FIND_PACKAGE(FLTK)
508
    MACRO_OPTIONAL_FIND_PACKAGE(FLTK)
508
    FIND_PACKAGE(GLUT)
509
    MACRO_OPTIONAL_FIND_PACKAGE(GLUT)
509
    FIND_PACKAGE(FOX)
510
    MACRO_OPTIONAL_FIND_PACKAGE(FOX)
510
511
511
    SET(wxWidgets_USE_LIBS base core gl net)
512
    SET(wxWidgets_USE_LIBS base core gl net)
512
    FIND_PACKAGE(wxWidgets)
513
    MACRO_OPTIONAL_FIND_PACKAGE(wxWidgets)
513
514
514
ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
515
ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
515
516
Lines 530-539 Link Here
530
# can use Quicktime.
531
# can use Quicktime.
531
IF(NOT ANDROID)
532
IF(NOT ANDROID)
532
    IF(NOT APPLE)
533
    IF(NOT APPLE)
533
        FIND_PACKAGE(GIFLIB)
534
        MACRO_OPTIONAL_FIND_PACKAGE(GIFLIB)
534
        FIND_PACKAGE(JPEG)
535
        MACRO_OPTIONAL_FIND_PACKAGE(JPEG)
535
        FIND_PACKAGE(PNG)
536
        MACRO_OPTIONAL_FIND_PACKAGE(PNG)
536
        FIND_PACKAGE(TIFF)
537
        MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
537
538
538
        # QuickTime is required for OS X, but optional for Windows.
539
        # QuickTime is required for OS X, but optional for Windows.
539
        IF(WIN32)
540
        IF(WIN32)
Lines 586-600 Link Here
586
  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
587
  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
587
ENDIF()
588
ENDIF()
588
589
589
IF(UNIX AND NOT WIN32 AND NOT APPLE)
590
SET(LIB_POSTFIX ${LIB_SUFFIX})
590
  IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
591
      SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
592
      MARK_AS_ADVANCED(LIB_POSTFIX)
593
  ENDIF()
594
ENDIF()
595
IF(NOT DEFINED LIB_POSTFIX)
596
    SET(LIB_POSTFIX "")
597
ENDIF()
598
591
599
# Here we apparantly do some funky stuff with making the bin/ and lib/
592
# Here we apparantly do some funky stuff with making the bin/ and lib/
600
# folders which is probably needed to work around a very old CMake bug?
593
# folders which is probably needed to work around a very old CMake bug?
Lines 884-890 Link Here
884
        ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
877
        ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
885
    )
878
    )
886
    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
879
    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
887
    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
880
    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openscenegraph-doc)
888
881
889
    # now set up openthreads documentation generation
882
    # now set up openthreads documentation generation
890
    IF(BUILD_REF_DOCS_TAGFILE)
883
    IF(BUILD_REF_DOCS_TAGFILE)
Lines 900-906 Link Here
900
        ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
893
        ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
901
    )
894
    )
902
    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
895
    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
903
    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
896
    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION ${GENTOO_DOCDIR} COMPONENT openthreads-doc)
904
897
905
    # Process our other doxyfiles but don't create targets for these
898
    # Process our other doxyfiles but don't create targets for these
906
    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
899
    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
(-)OpenSceneGraph-3.0.1/CMakeModules/COPYING-CMAKE-SCRIPTS (+22 lines)
Line 0 Link Here
1
Redistribution and use in source and binary forms, with or without
2
modification, are permitted provided that the following conditions
3
are met:
4
5
1. Redistributions of source code must retain the copyright
6
   notice, this list of conditions and the following disclaimer.
7
2. Redistributions in binary form must reproduce the copyright
8
   notice, this list of conditions and the following disclaimer in the
9
   documentation and/or other materials provided with the distribution.
10
3. The name of the author may not be used to endorse or promote products 
11
   derived from this software without specific prior written permission.
12
13
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
14
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
15
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
16
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
17
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
18
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
19
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
20
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
22
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
(-)OpenSceneGraph-3.0.1/CMakeModules/FindFLTK.cmake (-52 lines)
Lines 1-52 Link Here
1
# Locate FLTK
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
    ~/Library/Frameworks
16
    /Library/Frameworks
17
    /usr/local/include
18
    /usr/include
19
    /sw/include # Fink
20
    /opt/local/include # DarwinPorts
21
    /opt/csw/include # Blastwave
22
    /opt/include
23
    /usr/freeware/include
24
)
25
26
MACRO(FIND_FLTK_LIBRARY MYLIBRARY MYLIBRARYNAME)
27
28
    FIND_LIBRARY(${MYLIBRARY}
29
        NAMES ${MYLIBRARYNAME}
30
        PATHS
31
        $ENV{FLTK_DIR}/lib
32
        $ENV{FLTK_DIR}
33
        ~/Library/Frameworks
34
        /Library/Frameworks
35
        /usr/local/lib
36
        /usr/lib
37
        /sw/lib
38
        /opt/local/lib
39
        /opt/csw/lib
40
        /opt/lib
41
        /usr/freeware/lib64
42
    )
43
44
ENDMACRO(FIND_FLTK_LIBRARY LIBRARY LIBRARYNAME)
45
46
FIND_FLTK_LIBRARY(FLTK_LIBRARY fltk)
47
FIND_FLTK_LIBRARY(FLTK_GL_LIBRARY fltk_gl)
48
49
SET(FLTK_FOUND "NO")
50
IF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
51
    SET(FLTK_FOUND "YES")
52
ENDIF(FLTK_LIBRARY AND FLTK_INCLUDE_DIR)
(-)OpenSceneGraph-3.0.1/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-3.0.1/CMakeModules/OsgMacroUtils.cmake (-2 / +2 lines)
Lines 445-453 Link Here
445
        SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Examples")
445
        SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Examples")
446
        
446
        
447
        IF(APPLE)
447
        IF(APPLE)
448
            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )            
448
            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin BUNDLE DESTINATION bin)
449
        ELSE(APPLE)
449
        ELSE(APPLE)
450
            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
450
            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
451
        ENDIF(APPLE)
451
        ENDIF(APPLE)
452
452
453
ENDMACRO(SETUP_EXAMPLE)
453
ENDMACRO(SETUP_EXAMPLE)
(-)OpenSceneGraph-3.0.1/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 500716