From Rafa Gaitan, "I have added the macro SETUP_LIBRARY, similar to SETUP_PLUGIN or

SETUP_EXE, in order to have a unique entry point to build the
libraries. With this changes the android integration will be less
painful (currently is a big IF(ANDROID) for each CMakeLists.txt) and
more maintainable in the future. I hope next submissions will be for
supporting android from my colleague Jorge.
"
This commit is contained in:
Robert Osfield
2011-03-08 13:51:13 +00:00
parent 91b35436ac
commit 42b709a9f4
19 changed files with 156 additions and 148 deletions

View File

@@ -44,7 +44,7 @@ ENDIF()
SET(LIB_NAME osgDB)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS
SET(TARGET_H
${HEADER_PATH}/DataTypes
${HEADER_PATH}/StreamOperator
${HEADER_PATH}/Serializer
@@ -81,10 +81,7 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/XmlParser
)
# FIXME: For OS X, need flag for Framework or dylib
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
SET(TARGET_SRC
ObjectWrapper.cpp
InputStream.cpp
OutputStream.cpp
@@ -160,17 +157,13 @@ ENDIF()
ADD_DEFINITIONS(-DOSG_PLUGIN_EXTENSION=${CMAKE_SHARED_MODULE_SUFFIX})
LINK_INTERNAL(${LIB_NAME}
SET(TARGET_LIBRARIES
osg
osgUtil
OpenThreads
)
LINK_EXTERNAL(${LIB_NAME} ${OSGDB_PLATFORM_SPECIFIC_LIBRARIES} ${DL_LIBRARY})
LINK_WITH_VARIABLES(${LIB_NAME} ${COMPRESSION_LIBRARIES})
LINK_CORELIB_DEFAULT(${LIB_NAME})
SET(TARGET_EXTERNAL_LIBRARIES ${OSGDB_PLATFORM_SPECIFIC_LIBRARIES} ${DL_LIBRARY})
SET(TARGET_LIBRARIES_VARS ${COMPRESSION_LIBRARIES})
IF( ZLIB_FOUND )
SET( TARGET_LIBRARIES_VARS ZLIB_LIBRARY )
ENDIF( ZLIB_FOUND )
SETUP_LIBRARY(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)