diff --git a/CMakeModules/ModuleInstall.cmake b/CMakeModules/ModuleInstall.cmake index d12558e92..f50e4e162 100644 --- a/CMakeModules/ModuleInstall.cmake +++ b/CMakeModules/ModuleInstall.cmake @@ -27,14 +27,14 @@ ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL) INSTALL( TARGETS ${LIB_NAME} - RUNTIME DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph-core - LIBRARY DESTINATION ${INSTALL_LIBDIR} COMPONENT libopenscenegraph-core - ARCHIVE DESTINATION ${INSTALL_ARCHIVEDIR} COMPONENT libopenscenegraph-core-dev + RUNTIME DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph + LIBRARY DESTINATION ${INSTALL_LIBDIR} COMPONENT libopenscenegraph + ARCHIVE DESTINATION ${INSTALL_ARCHIVEDIR} COMPONENT libopenscenegraph-dev ) # FIXME: Do not run for OS X framework INSTALL( FILES ${LIB_PUBLIC_HEADERS} DESTINATION ${INSTALL_INCDIR}/${LIB_NAME} - COMPONENT libopenscenegraph-core-dev + COMPONENT libopenscenegraph-dev ) diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake index cab6957e1..5e6281b9a 100644 --- a/CMakeModules/OsgMacroUtils.cmake +++ b/CMakeModules/OsgMacroUtils.cmake @@ -307,7 +307,7 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME) 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 libopenscenegraph-examples ) + INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples ) ENDIF(APPLE) ENDMACRO(SETUP_EXAMPLE) diff --git a/src/osgViewer/CMakeLists.txt b/src/osgViewer/CMakeLists.txt index 70aa66733..2390cf7bc 100644 --- a/src/osgViewer/CMakeLists.txt +++ b/src/osgViewer/CMakeLists.txt @@ -160,6 +160,6 @@ FOREACH( INCLUDEFILE ${LIB_PUBLIC_HEADERS} ) INSTALL( FILES ${INCLUDEFILE} DESTINATION ${INSTALL_INCDIR}/${LIB_NAME}/${REL_INCLUDE_PATH} - COMPONENT libopenscenegraph-core-dev + COMPONENT libopenscenegraph-dev ) ENDFOREACH( INCLUDEFILE)