[CHANGE] - openthreads, once again a big mess with the OSG stuff. On some...

[CHANGE] - openthreads, once again a big mess with the OSG stuff. On some systems, osg libs do not link the openthreads lib although they need it. We do not use it but need to link it ...

src/CMakeLists.txt

@@ -161,7 +161,6 @@ IF( OW_PACKAGE_BUILD )
     SET( OW_PACKAGE_PACKAGER "cpack" CACHE STRING "Package builder. Set this to enable packager-specific options during install." )
 
     OPTION( OW_PACKAGE_NOCOPY_LICENSE "Disable to copy our licensing information. Enabling this can be useful for package maintainer since several packaging systems have their own licence mechanism (i.e. Debian)." OFF )
-    OPTION( OW_PACKAGE_NOLINK_OPENTHREADS "Enable this to avoid linking OpenThreads. On some systems, OpenSceneGraph already is linked against it and thus linking OpenThreads to OW is not needed (Debian and Ubuntu for example)." OFF )
     OPTION( OW_PACKAGE_NOCOPY_COREFONTS "Enable this if you have liberation fonts installed on your system. They will be linked. If disabled, our fonts are copied." OFF )
 ENDIF()
 
@@ -239,19 +238,6 @@ IF( CMAKE_GENERATOR MATCHES "Visual Studio" )
 ENDIF()
 FIND_PACKAGE( OpenSceneGraph ${MIN_OSG_VERSION} REQUIRED osgDB osgUtil osgGA osgViewer osgSim osgWidget osgText )
 
-# If the user did not disable license-copying, do it
-# NOTE: use this "double-negative" to use the fact that undefined variables yield FALSE.
-IF( OW_PACKAGE_NOLINK_OPENTHREADS )
-    # NOTE: this is a hack to remove the openthread lib from the list of OSG libs. It gets automatically added by the current
-    #       find script but it is not really needed on some systems (since they provide an osg lib which already is linked against this.).
-    FOREACH( osglib ${OPENSCENEGRAPH_LIBRARIES} )
-        STRING( REGEX MATCH ".*OpenThreads.*" IsExcluded "${osglib}" )
-        IF( IsExcluded )
-            LIST( REMOVE_ITEM OPENSCENEGRAPH_LIBRARIES ${osglib} )
-        ENDIF( IsExcluded )
-    ENDFOREACH()
-ENDIF()
-
 # -----------------------------------------------------------------------------------------------------------------------------------------------
 # Eigen3, at least 3.0.0
 # See http://eigen.tuxfamily.org

tools/packaging/debian/control

@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 8.0.0),
                cmake (>= 2.8.0), doxygen (>= 1.6.3), graphviz (>= 2.26.3),
                libgl1-mesa-dev | libgl-dev,
                libopenscenegraph-dev (>= 2.8.1), libopenthreads-dev (>= 2.8.1),
-               libqt4-dev (>= 4:4.6.0), libqtwebkit-dev (>= 2.0.0),
+               libqt4-dev (>= 4:4.6.0), libqtwebkit-dev (>= 2.0.0), libqt4-opengl-dev (>= 4:4.6.0),
                libboost-dev (>= 1.42.0), libboost-program-options-dev (>= 1.42.0), libboost-thread-dev (>= 1.42.0),
                libboost-filesystem-dev (>= 1.42.0), libboost-date-time-dev (>= 1.42.0), libboost-system-dev (>= 1.42.0),
                libboost-signals-dev (>= 1.42.0), libboost-regex-dev (>= 1.42.0),

tools/packaging/debian/rules

@@ -26,7 +26,6 @@ override_dh_auto_configure:
 							-DOW_USE_TESTS=OFF\
 							-DOW_PACKAGE_BUILD=ON\
 								-DOW_PACKAGE_NOCOPY_LICENSE=ON\
-								-DOW_PACKAGE_NOLINK_OPENTHREADS=ON\
 								-DOW_PACKAGE_NOCOPY_COREFONTS=ON\
 								-DOW_PACKAGE_PACKAGER=deb\
 							-DOW_MODULE_TOOLBOX_BASE=ON\