View | Details | Raw Unified | Return to bug 25943
Collapse All | Expand All

(-)OpenSceneGraph-3.0.0-orig/CMakeLists.txt (-2 / +2 lines)
Lines 884-890 Link Here
884 
        ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
 884 
        ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
885 
    )
 885 
    )
886 
    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
 886 
    #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)
 887 
#    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
888 

          888
          

        

        

          889
          
    # now set up openthreads documentation generation

          889
          
    # now set up openthreads documentation generation

        

        

          890
          
    IF(BUILD_REF_DOCS_TAGFILE)

          890
          
    IF(BUILD_REF_DOCS_TAGFILE)

        

  

    
      
            Lines 900-906
          
      
      
        Link Here
      
    
  

        

          900
          
        ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY

          900
          
        ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY

        

        

          901
          
    )

          901
          
    )

        

        

          902
          
    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)

          902
          
    #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)


              903
              
#    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)

            

        

          904
          

          904
          

        

        

          905
          
    # Process our other doxyfiles but don't create targets for these

          905
          
    # Process our other doxyfiles but don't create targets for these

        

        

          906
          
    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile

          906
          
    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile

        



(-)OpenSceneGraph-3.0.0-orig/CMakeModules/OsgMacroUtils.cmake
      (-1 / +1 lines)




  

    
      
            Lines 447-453
          
      
      
        Link Here
      
    
  

        

          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 share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/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.0-orig/examples/osgviewerSDL/CMakeLists.txt
      (-1 / +1 lines)




  

    
      
            Lines 13-19
          
      
      
        Link Here
      
    
  

        

          13
          
               # Depending on platform (or SDL version),

          13
          
               # Depending on platform (or SDL version),

        

        

          14
          
               # this may or may not link successfully.

          14
          
               # this may or may not link successfully.

        

        

          15
          
               SET(TARGET_SRC osgviewerSDL.cpp)

          15
          
               SET(TARGET_SRC osgviewerSDL.cpp)

        

          
            

              16
              
               SET(TARGET_EXTERNAL_LIBRARIES ${SDLMAIN_LIBRARY} ${TARGET_EXTERNAL_LIBRARIES} )


              16
              
               SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} ${TARGET_EXTERNAL_LIBRARIES} )

            

        

          17
          
       ENDIF()

          17
          
       ENDIF()

        

        

          18
          
ENDIF()

          18
          
ENDIF()

        

        

          19
          

          19
          

        






  

  Return to bug 25943