Changeset 6709

Show
Ignore:
Timestamp:
05/20/07 19:38:11
Author:
robert
Message:

Introduced VERSION and SOVERSION'ing of libraries.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenSceneGraph/trunk/CMakeLists.txt

    r6705 r6709  
    1818SET(OPENSCENEGRAPH_MINOR_VERSION 9) 
    1919SET(OPENSCENEGRAPH_PATCH_VERSION 4) 
    20  
    21 SET(OSG_PLUGINS osgPlugins-${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}) 
     20SET(OPENSCENEGRAPH_SOVERSION 6) 
     21 
     22SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}) 
     23 
     24SET(OSG_PLUGINS osgPlugins-${OPENSCENEGRAPH_VERSION}) 
     25 
     26# We want to build SONAMES shared librariess 
     27SET(OPENSCENEGRAPH_SONAMES TRUE) 
     28SET(OPENTHREADS_SONAMES TRUE) 
    2229 
    2330SET(OpenThreads_SOURCE_DIR ${OpenSceneGraph_SOURCE_DIR}) 

  • OpenSceneGraph/trunk/CMakeModules/OsgMacroUtils.cmake

    r6705 r6709  
    4040MACRO(LINK_CORELIB_DEFAULT CORELIB_NAME) 
    4141    LINK_EXTERNAL(${CORELIB_NAME} ${OPENGL_LIBRARIES})  
     42    LINK_WITH_VARIABLES(${CORELIB_NAME} OPENTHREADS_LIBRARY) 
     43    IF(OPENSCENEGRAPH_SONAMES) 
     44      SET_TARGET_PROPERTIES(${CORELIB_NAME} PROPERTIES VERSION ${OPENSCENEGRAPH_VERSION} SOVERSION ${OPENSCENEGRAPH_SOVERSION}) 
     45    ENDIF(OPENSCENEGRAPH_SONAMES) 
    4246ENDMACRO(LINK_CORELIB_DEFAULT CORELIB_NAME) 
    4347 
    …… 
    119123    ENDIF(NOT MSVC) 
    120124    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}") 
    121  
     125  
    122126    SETUP_LINK_LIBRARIES() 
    123127