Moved the OpenThreads link locally to each lib

CMakeModules/OsgMacroUtils.cmake

@@ -34,14 +34,11 @@ ENDMACRO(LINK_EXTERNAL TRGTNAME)
 
 
 #######################################################################################################
-#  macro for common setup of core libraries: it links OPENGL_LIBRARIES in undifferentiated mode and
+#  macro for common setup of core libraries: it links OPENGL_LIBRARIES in undifferentiated mode
-#  OPENTHREADS_LIBRARY as Differentiated, so if existe the variable OPENTHREADS_LIBRARY_DEBUG, it uses 
-#  the content of this library for linking when in debugging
 #######################################################################################################
 
 MACRO(LINK_CORELIB_DEFAULT CORELIB_NAME)
     LINK_EXTERNAL(${CORELIB_NAME} ${OPENGL_LIBRARIES}) 
-    LINK_WITH_VARIABLES(${CORELIB_NAME} OPENTHREADS_LIBRARY)
 ENDMACRO(LINK_CORELIB_DEFAULT CORELIB_NAME)
 
 

src/osgDB/CMakeLists.txt

@@ -75,6 +75,7 @@ ENDIF(VRML_FOUND)
 
 LINK_INTERNAL(${LIB_NAME} 	
 	osg
+	OpenThreads
 )
 LINK_EXTERNAL(${LIB_NAME} 	${OSGDB_PLATFORM_SPECIFIC_LIBRARIES} )
 LINK_CORELIB_DEFAULT(${LIB_NAME})

src/osgFX/CMakeLists.txt

@@ -41,6 +41,7 @@ LINK_INTERNAL(${LIB_NAME}
 	osgUtil
 	osgDB
 	osg
+	OpenThreads
 )
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 

src/osgGA/CMakeLists.txt

@@ -48,11 +48,10 @@ ADD_LIBRARY(${LIB_NAME}
 	Version.cpp
 )
 
-TARGET_LINK_LIBRARIES(${LIB_NAME}
+LINK_INTERNAL(${LIB_NAME} 	
-	osgUtil
+	osgDB
 	osg
-	${OPENTHREADS_LIBRARY}
+	OpenThreads
-	${OPENGL_LIBRARIES}
 )
 
 INCLUDE(ModuleInstall OPTIONAL)

src/osgManipulator/CMakeLists.txt

@@ -61,6 +61,7 @@ LINK_INTERNAL(${LIB_NAME}
 	osgGA
 	osgUtil
 	osg
+	OpenThreads
 )
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 

src/osgParticle/CMakeLists.txt

@@ -80,6 +80,7 @@ LINK_INTERNAL(${LIB_NAME}
 	osgUtil
 	osgDB
 	osg
+	OpenThreads
 )
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 

src/osgShadow/CMakeLists.txt

@@ -37,6 +37,7 @@ LINK_INTERNAL(${LIB_NAME}
 	osgUtil
 	osgDB
 	osg
+	OpenThreads
 )
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 

src/osgSim/CMakeLists.txt

@@ -67,6 +67,7 @@ LINK_INTERNAL(${LIB_NAME}
 	osgText
 	osgUtil
 	osg
+	OpenThreads
 )
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 

src/osgTerrain/CMakeLists.txt

@@ -32,6 +32,7 @@ LINK_INTERNAL(${LIB_NAME}
 	osgUtil
 	osgDB
 	osg
+	OpenThreads
 )
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 

src/osgText/CMakeLists.txt

@@ -32,6 +32,7 @@ ADD_LIBRARY(${LIB_NAME}
 LINK_INTERNAL(${LIB_NAME} 	
 	osgDB
 	osg
+	OpenThreads
 )
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 

src/osgUtil/CMakeLists.txt

@@ -82,6 +82,7 @@ ADD_LIBRARY(${LIB_NAME}
 
 LINK_INTERNAL(${LIB_NAME} 	
 	osg
+	OpenThreads
 )
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 

src/osgViewer/CMakeLists.txt

@@ -77,6 +77,7 @@ LINK_INTERNAL(${LIB_NAME}
 	osgDB
 	osgUtil
 	osg
+	OpenThreads
 )
 
 LINK_CORELIB_DEFAULT(${LIB_NAME})