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.
"

src/osg/CMakeLists.txt

@@ -8,7 +8,6 @@ ENDIF()
 
 SET(LIB_NAME osg)
 
-
 #
 # Enable workaround for OpenGL driver crash with occlusion query
 #
@@ -19,7 +18,7 @@ ENDIF()
 
 
 SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
-SET(LIB_PUBLIC_HEADERS
+SET(TARGET_H
     ${HEADER_PATH}/AlphaFunc
     ${HEADER_PATH}/AnimationPath
     ${HEADER_PATH}/ApplicationUsage
@@ -196,9 +195,10 @@ SET(LIB_PUBLIC_HEADERS
     ${OPENSCENEGRAPH_CONFIG_HEADER}
 )
 
-ADD_LIBRARY(${LIB_NAME}
-    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-    ${LIB_PUBLIC_HEADERS}
+#ADD_LIBRARY(${LIB_NAME}
+#    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
+#    ${LIB_PUBLIC_HEADERS}
+SET(TARGET_SRC
     AlphaFunc.cpp
     AnimationPath.cpp
     ApplicationUsage.cpp
@@ -373,11 +373,22 @@ ADD_LIBRARY(${LIB_NAME}
 
     ${OPENSCENEGRAPH_VERSIONINFO_RC}
 )
+SET(TARGET_LIBRARIES OpenThreads)
 
-LINK_INTERNAL(${LIB_NAME}     
-    OpenThreads
+SET(TARGET_EXTERNAL_LIBRARIES
+    ${CMAKE_THREAD_LIBS_INIT}    
+    ${MATH_LIBRARY} 
+    ${RT_LIBRARY} 
+    ${DL_LIBRARY}
 )
-LINK_EXTERNAL(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT}    ${MATH_LIBRARY} ${RT_LIBRARY} ${DL_LIBRARY})
-LINK_CORELIB_DEFAULT(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY} ${RT_LIBRARY} )
 
-INCLUDE(ModuleInstall OPTIONAL)
+#LINK_INTERNAL(${LIB_NAME}     
+#    OpenThreads
+#)
+#LINK_EXTERNAL(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT}    ${MATH_LIBRARY} ${RT_LIBRARY} ${DL_LIBRARY})
+#LINK_CORELIB_DEFAULT(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY} ${RT_LIBRARY} )
+
+#INCLUDE(ModuleInstall OPTIONAL)
+
+SETUP_LIBRARY(${LIB_NAME})
+