From Mathias Helsing, "Cpack support submission with:
Better package naming. example openscenegraph-core-2.7.7-Linux-i386.tar.gz on my ubuntu laptop and openscenegraph-core.2.7.7-win32-x86-vc80.tar.gz on winxp. CMakers will not get options for selecting compression format. TGZ goes for all platforms (on win32 I use 7zip) The wrappers is now given the COMPONENT name libopenscenegraph-wrappers. Feel free to change the name. On windows with visual studio the OsgCPack script make some efforts to discover the compiler used but support is a bit poor so I've given CMake acces to OSG_CPACK_COMPILER to provide some mean to name the compiler. stop The platform part is taken from CMAKE_SYSTEM_NAME and for windows I change this to win32 or win64 based on CMAKE_CL_64. This might not be necessary if the arch part has that information. This information is taken from CMAKE_SYSTEM_PROCESSOR. I only have 32bit here so if some of you could uncomment line 15,16 in OsgCPack.cmake and report what cmake report it would be nice. I'm especially interested anything but win32 and linux32"
This commit is contained in:
@@ -114,9 +114,9 @@ MACRO(ADD_WRAPPER_LIB SUBDIR EXPORTDEF)
|
||||
REMOVE(EXCLUDE ${EXCLUDE})
|
||||
|
||||
IF(WIN32)
|
||||
INSTALL(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib/${OSG_PLUGINS} LIBRARY DESTINATION bin/${OSG_PLUGINS} )
|
||||
INSTALL(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib/${OSG_PLUGINS} LIBRARY DESTINATION bin/${OSG_PLUGINS} COMPONENT libopenscenegraph-wrappers)
|
||||
ELSE(WIN32)
|
||||
INSTALL(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} LIBRARY DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} )
|
||||
INSTALL(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} LIBRARY DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} COMPONENT libopenscenegraph-wrappers)
|
||||
ENDIF(WIN32)
|
||||
|
||||
ENDMACRO(ADD_WRAPPER_LIB)
|
||||
|
||||
Reference in New Issue
Block a user