Attachment 895500 Details for Bug 1097584 – Patch to fix install, soversion, and boost linking.

[patch] Patch to fix install, soversion, and boost linking.

shiny-cmake_fixes.patch (text/plain), 1.18 KB, created by Richard Shaw on 2014-05-14 13:49:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard Shaw

Created: 2014-05-14 13:49:53 UTC

Size: 1.18 KB

patch

obsolete

>diff -Naur shiny-f41178f82765828ac09f9f1da5bd28038c94311d.orig/CMakeLists.txt shiny-f41178f82765828ac09f9f1da5bd28038c94311d/CMakeLists.txt
>--- shiny-f41178f82765828ac09f9f1da5bd28038c94311d.orig/CMakeLists.txt	2014-05-14 07:55:57.845045283 -0500
>+++ shiny-f41178f82765828ac09f9f1da5bd28038c94311d/CMakeLists.txt	2014-05-14 08:41:34.589314049 -0500
>@@ -27,6 +27,10 @@
> include_directories(${Boost_INCLUDE_DIRS})
> add_definitions(-DBOOST_ALL_NO_LIB)
> add_library(${SHINY_LIBRARY} SHARED ${SOURCE_FILES})
>+target_link_libraries(${SHINY_LIBRARY} ${Boost_LIBRARIES})
>+include_directories(${Boost_INCLUDE_DIRS})
>+set_target_properties(${SHINY_LIBRARY} PROPERTIES SOVERSION @SOVERSION@)
>+install(TARGETS ${SHINY_LIBRARY} LIBRARY DESTINATION lib${LIB_SUFFIX})
> 
> set(SHINY_LIBRARIES ${SHINY_LIBRARY})
> 
>@@ -51,6 +54,8 @@
>     add_library(${SHINY_OGREPLATFORM_LIBRARY} SHARED ${OGRE_PLATFORM_SOURCE_FILES})
>     add_dependencies(${SHINY_OGREPLATFORM_LIBRARY} ${SHINY_LIBRARY})
>     set(SHINY_LIBRARIES ${SHINY_LIBRARIES} ${SHINY_OGREPLATFORM_LIBRARY})
>+    install(TARGETS ${SHINY_OGREPLATFORM_LIBRARY}
>+        LIBRARY DESTINATION lib${LIB_SUFFIX}//OGRE)
> endif()
> 
> set(SHINY_LIBRARY ${SHINY_LIBRARY} PARENT_SCOPE)

Actions: View | Diff

Attachments on bug 1097584: 895500 | 895501