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

@@ -8,7 +8,7 @@ ENDIF()
SET(LIB_NAME osgUtil)
SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
SET(LIB_PUBLIC_HEADERS
SET(TARGET_H
${HEADER_PATH}/ConvertVec
${HEADER_PATH}/CubeMapGenerator
${HEADER_PATH}/CullVisitor
@@ -52,9 +52,7 @@ SET(LIB_PUBLIC_HEADERS
${HEADER_PATH}/Version
)
ADD_LIBRARY(${LIB_NAME}
${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
${LIB_PUBLIC_HEADERS}
SET(TARGET_SRC
CubeMapGenerator.cpp
CullVisitor.cpp
DelaunayTriangulator.cpp
@@ -110,10 +108,10 @@ ADD_LIBRARY(${LIB_NAME}
INCLUDE_DIRECTORIES("tristripper/include")
LINK_INTERNAL(${LIB_NAME}
SET(TARGET_LIBRARIES
osg
OpenThreads
)
LINK_CORELIB_DEFAULT(${LIB_NAME})
INCLUDE(ModuleInstall OPTIONAL)
SETUP_LIBRARY(${LIB_NAME})