Changeset 6346

Show
Ignore:
Timestamp:
03/12/07 13:46:36
Author:
robert
Message:

Fixed install paths of wrappers and plugins

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenSceneGraph/trunk/CMakeModules/OsgMacroUtils.cmake

    r6329 r6346  
    239239                ENDFOREACH(LINKLIB) 
    240240        #ELSE(UNIX) 
    241         #       SET_TARGET_PROPERTIES(${TARGET} PROPERTIES PROJECT_LABEL "osgPlugin ${SUBDIR}") 
     241        #       SET_TARGET_PROPERTIES(${TARGET} PROPERTIES PROJECT_LABEL "osgPlugins ${SUBDIR}") 
    242242        #       TARGET_LINK_LIBRARIES(${TARGET} osg osgDB osgUtil ${ARGV1} ${ARGV2} ${ARGV3} ${ARGV4} ${ARGV5}) 
    243243        #ENDIF(UNIX) 
    …… 
    248248                INSTALL(TARGETS ${TARGET} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION bin ) 
    249249        ELSE(WIN32) 
    250                 INSTALL(TARGETS ${TARGET} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/osgPlugin LIBRARY DESTINATION lib${LIB_POSTFIX}/osgPlugin ) 
     250                INSTALL(TARGETS ${TARGET} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/osgPlugins LIBRARY DESTINATION lib${LIB_POSTFIX}/osgPlugins ) 
    251251        ENDIF(WIN32) 
    252252ENDMACRO(ADD_OSG_PLUGIN) 

  • OpenSceneGraph/trunk/src/osgWrappers/CMakeLists.txt

    r6341 r6346  
    3232                IF(${EXPRESSION}) 
    3333                        SET(${LISTNAME} ${CURRLIST}) 
    34                         MESSAGE(STATUS "STORED LIST [${LISTNAME}] = (${CURRLIST})") 
     34                        # MESSAGE(STATUS "STORED LIST [${LISTNAME}] = (${CURRLIST})") 
    3535                        SET(LISTNAME ${ARG}) 
    3636                        REMOVE(CURRLIST ${CURRLIST} ) 
    …… 
    7171        REMOVE(EXCLUDE ${EXCLUDE})       
    7272         
    73         INSTALL_TARGETS(/lib ${TARGET_NAME} ) 
     73        IF(WIN32) 
     74                INSTALL(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION bin ) 
     75        ELSE(WIN32) 
     76                INSTALL(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/osgPlugins LIBRARY DESTINATION lib${LIB_POSTFIX}/osgPlugins ) 
     77        ENDIF(WIN32) 
    7478         
    7579ENDMACRO(ADD_WRAPPER_LIB)