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

@@ -7,7 +7,7 @@ ENDIF()
SET(LIB_NAME osgText)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS
SET(TARGET_H
${HEADER_PATH}/Export
${HEADER_PATH}/Font
${HEADER_PATH}/Font3D
@@ -23,9 +23,7 @@ SET(LIB_PUBLIC_HEADERS
)
# 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
DefaultFont.cpp
DefaultFont.h
GlyphGeometry.h
@@ -42,12 +40,12 @@ ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_VERSIONINFO_RC}
)
LINK_INTERNAL(${LIB_NAME}
SET(TARGET_LIBRARIES
osgDB
osg
osgUtil
OpenThreads
)
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)
SETUP_LIBRARY(${LIB_NAME})