Changeset 6430

Timestamp:

03/29/07 12:56:07

Author:

robert

Message:

From Eric Wing, added handling of CMAKE_THREAD_LIBS_INIT

Files:

• OpenSceneGraph/trunk/CMakeLists.txt (modified) (3 diffs)
• OpenSceneGraph/trunk/CMakeModules/FindOpenThreads.cmake (modified) (1 diff)
• OpenSceneGraph/trunk/src/osg/CMakeLists.txt (modified) (1 diff)

OpenSceneGraph/trunk/CMakeLists.txt

@@ -48 +48 @@
-
-ENDIF(USING_OSG_OP_OT_TRIPLE_SET)
+
+# Okay, here's the problem: On some platforms, linking against OpenThreads
+# is not enough and explicit linking to the underlying thread library 
+# is also required (e.g. FreeBSD). But OpenThreads may be built with different
+# backends (Pthreads, Sproc, Windows) so we don't know what the underlying 
+# thread library is because some platforms support multiple backends (e.g. 
+# IRIX supports Sproc and Pthreads). Linking all libraries won't work 
+# because the libraries may be incompatible.
+# So the current solution is to attempt best guess linking and exempt certain 
+# cases. With IRIX, we're going to hope explicit linking to the underlying
+# library is not necessary. We currently don't case for pthreads on Windows
+# which might be an issue on things like Cygwin. This may need to be fixed.
+FIND_PACKAGE(Threads)
+IF(CMAKE_SYSTEM MATCHES IRIX)
+        # Erase CMAKE_THREAD_LIBS_INIT and hope it works
+        SET(CMAKE_THREAD_LIBS_INIT "" CACHE INTERNAL "")        
+ENDIF(CMAKE_SYSTEM MATCHES IRIX)
+
-
-# Find OpenGL
@@ -108 +126 @@
-################################################################################
-# 3rd Party Dependency Stuff
-MSVC
+WIN32
-        INCLUDE(Find3rdPartyDependencies)
-MSVC
+WIN32
-
-# Common to all platforms:
@@ -165 +183 @@
-
-SET(LIB_POSTFIX "")
-if (UNIX AND NOT WIN32
-if 
+IF(UNIX AND NOT WIN32 AND NOT APPLE
+IF
-        SET(LIB_POSTFIX "64")
-endif 
-endif (UNIX AND NOT WIN32
+ENDIF
+ENDIF(UNIX AND NOT WIN32 AND NOT APPLE
-
-#SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin/${CMAKE_SYSTEM_NAME})

OpenSceneGraph/trunk/CMakeModules/FindOpenThreads.cmake

@@ -81 +81 @@
-  # MESSAGE("-- Found OpenThreads: "${OPENTHREADS_LIBRARY})
-  IF(NOT OPENTHREADS_LIBRARY_DEBUG)
-       
+         # 
-        SET(OPENTHREADS_LIBRARY_DEBUG "${OPENTHREADS_LIBRARY}")
-  ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG)

OpenSceneGraph/trunk/src/osg/CMakeLists.txt

@@ -292 +292 @@
-)
-
-
-      
+${CMAKE_THREAD_LIBS_INIT}
+${CMAKE_THREAD_LIBS_INIT} 
-
-INCLUDE(ModuleInstall OPTIONAL)