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:
@@ -1,4 +1,3 @@
|
||||
|
||||
IF(DYNAMIC_OPENSCENEGRAPH)
|
||||
ADD_DEFINITIONS(-DOSGANIMATION_LIBRARY)
|
||||
ELSE()
|
||||
@@ -7,9 +6,8 @@ ENDIF()
|
||||
|
||||
SET(LIB_NAME osgAnimation)
|
||||
|
||||
|
||||
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
|
||||
SET(LIB_PUBLIC_HEADERS
|
||||
SET(TARGET_H
|
||||
${HEADER_PATH}/Action
|
||||
${HEADER_PATH}/ActionAnimation
|
||||
${HEADER_PATH}/ActionBlendIn
|
||||
@@ -57,10 +55,7 @@ SET(LIB_PUBLIC_HEADERS
|
||||
${HEADER_PATH}/VertexInfluence
|
||||
)
|
||||
|
||||
|
||||
ADD_LIBRARY(${LIB_NAME}
|
||||
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
|
||||
${LIB_PUBLIC_HEADERS}
|
||||
SET(TARGET_SRC
|
||||
Action.cpp
|
||||
ActionAnimation.cpp
|
||||
ActionBlendIn.cpp
|
||||
@@ -98,7 +93,7 @@ ADD_LIBRARY(${LIB_NAME}
|
||||
${OPENSCENEGRAPH_VERSIONINFO_RC}
|
||||
)
|
||||
|
||||
LINK_INTERNAL(${LIB_NAME}
|
||||
SET(TARGET_LIBRARIES
|
||||
osg
|
||||
osgText
|
||||
osgGA
|
||||
@@ -106,5 +101,5 @@ LINK_INTERNAL(${LIB_NAME}
|
||||
OpenThreads
|
||||
)
|
||||
|
||||
LINK_CORELIB_DEFAULT(${LIB_NAME})
|
||||
INCLUDE(ModuleInstall OPTIONAL)
|
||||
SETUP_LIBRARY(${LIB_NAME})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user