FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed install paths of wrappers and plugins

Browse Source
This commit is contained in:
Robert Osfield 2007-03-12 12:46:36 +00:00
parent 1d213da760
commit 54127cea20
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeModules/OsgMacroUtils.cmake
View File

@ -238,7 +238,7 @@ MACRO(ADD_OSG_PLUGIN SUBDIR)
ENDIF(${LINKLIB} MATCHES "osg") ENDIF(${LINKLIB} MATCHES "osg")
ENDFOREACH(LINKLIB) ENDFOREACH(LINKLIB)
#ELSE(UNIX) #ELSE(UNIX)
# SET_TARGET_PROPERTIES(${TARGET} PROPERTIES PROJECT_LABEL "osgPlugin ${SUBDIR}") # SET_TARGET_PROPERTIES(${TARGET} PROPERTIES PROJECT_LABEL "osgPlugins ${SUBDIR}")
# TARGET_LINK_LIBRARIES(${TARGET} osg osgDB osgUtil ${ARGV1} ${ARGV2} ${ARGV3} ${ARGV4} ${ARGV5}) # TARGET_LINK_LIBRARIES(${TARGET} osg osgDB osgUtil ${ARGV1} ${ARGV2} ${ARGV3} ${ARGV4} ${ARGV5})
#ENDIF(UNIX) #ENDIF(UNIX)
#speed#TARGET_LOCATIONS_ACCUM(${TARGET}) #speed#TARGET_LOCATIONS_ACCUM(${TARGET})
@ -247,7 +247,7 @@ MACRO(ADD_OSG_PLUGIN SUBDIR)
IF(WIN32) IF(WIN32)
INSTALL(TARGETS ${TARGET} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION bin ) INSTALL(TARGETS ${TARGET} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION bin )
ELSE(WIN32) ELSE(WIN32)
INSTALL(TARGETS ${TARGET} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/osgPlugin LIBRARY DESTINATION lib${LIB_POSTFIX}/osgPlugin ) INSTALL(TARGETS ${TARGET} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/osgPlugins LIBRARY DESTINATION lib${LIB_POSTFIX}/osgPlugins )
ENDIF(WIN32) ENDIF(WIN32)
ENDMACRO(ADD_OSG_PLUGIN) ENDMACRO(ADD_OSG_PLUGIN)

8
src/osgWrappers/CMakeLists.txt
View File

@ -31,7 +31,7 @@ MACRO(ADD_WRAPPER_LIB SUBDIR EXPORTDEF)
SET(EXPRESSION ${IS_LINK} OR ${IS_DEFINE} OR ${IS_EXCLUDE}) SET(EXPRESSION ${IS_LINK} OR ${IS_DEFINE} OR ${IS_EXCLUDE})
IF(${EXPRESSION}) IF(${EXPRESSION})
SET(${LISTNAME} ${CURRLIST}) SET(${LISTNAME} ${CURRLIST})
MESSAGE(STATUS "STORED LIST [${LISTNAME}] = (${CURRLIST})") # MESSAGE(STATUS "STORED LIST [${LISTNAME}] = (${CURRLIST})")
SET(LISTNAME ${ARG}) SET(LISTNAME ${ARG})
REMOVE(CURRLIST ${CURRLIST} ) REMOVE(CURRLIST ${CURRLIST} )
@ -70,7 +70,11 @@ MACRO(ADD_WRAPPER_LIB SUBDIR EXPORTDEF)
REMOVE(LINK ${LINK}) REMOVE(LINK ${LINK})
REMOVE(EXCLUDE ${EXCLUDE}) REMOVE(EXCLUDE ${EXCLUDE})
INSTALL_TARGETS(/lib ${TARGET_NAME} ) IF(WIN32)
INSTALL(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION bin )
ELSE(WIN32)
INSTALL(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/osgPlugins LIBRARY DESTINATION lib${LIB_POSTFIX}/osgPlugins )
ENDIF(WIN32)
ENDMACRO(ADD_WRAPPER_LIB) ENDMACRO(ADD_WRAPPER_LIB)