Attachment 5023 Details for Bug 25943 – Адаптированный для 3.0.0 редхатовский патч от 2.8.3.

[patch] Адаптированный для 3.0.0 редхатовский патч от 2.8.3.

OpenSceneGraph-3.0.0-altlinux.patch (text/plain), 2.97 KB, created by Дмитрий Державин on 2011-07-22 17:27:35 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Дмитрий Державин

Created: 2011-07-22 17:27:35 MSK

Size: 2.97 KB

patch

obsolete

>diff -ruN OpenSceneGraph-3.0.0-orig/CMakeLists.txt OpenSceneGraph-3.0.0/CMakeLists.txt
>--- OpenSceneGraph-3.0.0-orig/CMakeLists.txt	2011-06-27 14:45:36.000000000 +0400
>+++ OpenSceneGraph-3.0.0/CMakeLists.txt	2011-07-22 15:34:29.000000000 +0400
>@@ -884,7 +884,7 @@
>         ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
>     )
>     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
>-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
>+#    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
> 
>     # now set up openthreads documentation generation
>     IF(BUILD_REF_DOCS_TAGFILE)
>@@ -900,7 +900,7 @@
>         ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
>     )
>     #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
>-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
>+#    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
> 
>     # Process our other doxyfiles but don't create targets for these
>     CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
>diff -ruN OpenSceneGraph-3.0.0-orig/CMakeModules/OsgMacroUtils.cmake OpenSceneGraph-3.0.0/CMakeModules/OsgMacroUtils.cmake
>--- OpenSceneGraph-3.0.0-orig/CMakeModules/OsgMacroUtils.cmake	2011-04-21 21:16:27.000000000 +0400
>+++ OpenSceneGraph-3.0.0/CMakeModules/OsgMacroUtils.cmake	2011-07-22 15:41:53.000000000 +0400
>@@ -447,7 +447,7 @@
>         IF(APPLE)
>             INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )            
>         ELSE(APPLE)
>-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
>+            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph-examples )
>         ENDIF(APPLE)
> 
> ENDMACRO(SETUP_EXAMPLE)
>diff -ruN OpenSceneGraph-3.0.0-orig/examples/osgviewerSDL/CMakeLists.txt OpenSceneGraph-3.0.0/examples/osgviewerSDL/CMakeLists.txt
>--- OpenSceneGraph-3.0.0-orig/examples/osgviewerSDL/CMakeLists.txt	2010-01-18 17:27:20.000000000 +0300
>+++ OpenSceneGraph-3.0.0/examples/osgviewerSDL/CMakeLists.txt	2011-07-22 15:42:03.000000000 +0400
>@@ -13,7 +13,7 @@
>                # Depending on platform (or SDL version),
>                # this may or may not link successfully.
>                SET(TARGET_SRC osgviewerSDL.cpp)
>-               SET(TARGET_EXTERNAL_LIBRARIES ${SDLMAIN_LIBRARY} ${TARGET_EXTERNAL_LIBRARIES} )
>+               SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} ${TARGET_EXTERNAL_LIBRARIES} )
>        ENDIF()
> ENDIF()
>

Actions: View | Diff

Attachments on bug 25943: 5022 | 5023