Revert to simgears thread support. Flightgear side.

For all source directories outside of simgear/scene,
which really depends very hard on osg, avoid using osg
classes. This should reenable the use of some basic and
scenegraph independent parts of simgear without the
the need for osg.

CMakeModules/FindSimGear.cmake

@@ -129,7 +129,6 @@ if(${SIMGEAR_LIBRARIES} STREQUAL "SIMGEAR_LIBRARIES-NOTFOUND")
         bvh
         util route
         timing
-        ${thread_lib}
         io
         serial
         sound
@@ -137,6 +136,7 @@ if(${SIMGEAR_LIBRARIES} STREQUAL "SIMGEAR_LIBRARIES-NOTFOUND")
         props
         xml
         misc
+        ${thread_lib}
         debug
         magvar
         math)

utils/GPSsmooth/CMakeLists.txt

@@ -7,6 +7,7 @@ target_link_libraries(GPSsmooth
 	${SIMGEAR_IO_LIBRARY}
 	${SIMGEAR_MISC_LIBRARY}
 	${SIMGEAR_STRUCTURE_LIBRARY}
+	${SIMGEAR_THREADS_LIBRARY}
 	${SIMGEAR_TIMING_LIBRARY}
 	${SIMGEAR_DEBUG_LIBRARY}
 	${PLIB_SG_LIBRARY}
@@ -15,7 +16,6 @@ target_link_libraries(GPSsmooth
 	${WINMM_LIBRARY}
 	${WINSOCK_LIBRARY}
 	${ZLIB_LIBRARIES}
-  ${OPENTHREADS_LIBRARIES}
 	${RT_LIBRARY}
 )
 
@@ -24,9 +24,9 @@ target_link_libraries(MIDGsmooth
 	${SIMGEAR_MATH_LIBRARY}
 	${SIMGEAR_SERIAL_LIBRARY}
 	${SIMGEAR_STRUCTURE_LIBRARY}
+	${SIMGEAR_THREADS_LIBRARY}
 	${SIMGEAR_TIMING_LIBRARY}
 	${SIMGEAR_DEBUG_LIBRARY}
-  ${OPENTHREADS_LIBRARIES}
 	${PLIB_SG_LIBRARY}
 	${PLIB_UL_LIBRARY}
 	${WINMM_LIBRARY}
@@ -41,8 +41,8 @@ target_link_libraries(UGsmooth
 	${SIMGEAR_MISC_LIBRARY}
 	${SIMGEAR_SERIAL_LIBRARY}
 	${SIMGEAR_STRUCTURE_LIBRARY}
+	${SIMGEAR_THREADS_LIBRARY}
 	${SIMGEAR_TIMING_LIBRARY}
-  ${OPENTHREADS_LIBRARIES}
 	${PLIB_SG_LIBRARY}
 	${PLIB_UL_LIBRARY}
 	${WINMM_LIBRARY}

utils/TerraSync/CMakeLists.txt

@@ -4,9 +4,9 @@ add_executable(terrasync terrasync.cxx)
 
 target_link_libraries(terrasync
 	${SIMGEAR_LIBRARIES}
-  ${OPENTHREADS_LIBRARIES}
 	${ZLIB_LIBRARIES}
-    ${WINSOCK_LIBRARY})
+    ${WINSOCK_LIBRARY}
+    ${RT_LIBRARY})
 
 if(LIBSVN_FOUND)
 	target_link_libraries(terrasync ${LIBSVN_LIBRARIES})

utils/fgpanel/CMakeLists.txt

@@ -16,14 +16,13 @@ if(GLUT_FOUND)
 		panel_io.cxx)
 
 	target_link_libraries(fgpanel 
-		${RT_LIBRARY}
 		${PNG_LIBRARIES}
 		${GLUT_LIBRARIES}
 		${SIMGEAR_LIBRARIES}
-    ${OPENTHREADS_LIBRARIES}
 		${OPENGL_LIBRARIES}
 		${ZLIB_LIBRARIES}
 		${PLIB_LIBRARIES}
+		${RT_LIBRARY}
 		)
 
 	install(TARGETS fgpanel RUNTIME DESTINATION bin)

utils/fgviewer/CMakeLists.txt

@@ -6,6 +6,7 @@ target_link_libraries(fgviewer
 	${OPENSCENEGRAPH_LIBRARIES}
 	${OPENGL_LIBRARIES}
 	${ZLIB_LIBRARIES}
-	${PLIB_LIBRARIES})
+	${PLIB_LIBRARIES}
+        ${RT_LIBRARY})
 
 install(TARGETS fgviewer RUNTIME DESTINATION bin)