Replace pthread linking with cmake-based variable

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
1 year ago · e91e7e7f8a
parent 4b6172160b
commit e91e7e7f8a
5 changed files with 7 additions and 5 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -27,6 +27,7 @@ set( PACKAGE tdenetwork )
 ##### include essential cmake modules ###########

 include( FindPkgConfig )
+include( FindThreads )
 include( CheckFunctionExists )
 include( CheckSymbolExists )
 include( CheckIncludeFile )
--- a/kdict/CMakeLists.txt
+++ b/kdict/CMakeLists.txt
@ -44,5 +44,5 @@ tde_add_tdeinit_executable( kdict AUTOMOC
  SOURCES
    dcopinterface.skel main.cpp actions.cpp dict.cpp options.cpp
    queryview.cpp toplevel.cpp sets.cpp matchview.cpp application.cpp
-  LINK tdehtml-shared pthread
+  LINK tdehtml-shared ${CMAKE_THREAD_LIBS_INIT}
 )
--- a/kopete/protocols/jabber/CMakeLists.txt
+++ b/kopete/protocols/jabber/CMakeLists.txt
@ -22,7 +22,7 @@ if( WITH_JINGLE )
    cricketp2pclient-static cricketxmpp-static cricketp2pbase-static cricketbase-static
    mediastreamer-static ortp-static
    ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GMODULE2_LIBRARIES}
-    ${EXPAT_LIBRARY} ${SPEEX_LIBRARIES} pthread
+    ${EXPAT_LIBRARY} ${SPEEX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
  )
 endif( )

--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/CMakeLists.txt
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/CMakeLists.txt
@ -36,7 +36,7 @@ tde_add_executable( relayserver
  SOURCES
    relayserver.cpp relayserver_main.cpp
  LINK
-    cricketbase-static cricketp2pbase-static pthread
+    cricketbase-static cricketp2pbase-static ${CMAKE_THREAD_LIBS_INIT}
  DESTINATION ${BIN_INSTALL_DIR}
 )

@ -47,6 +47,6 @@ tde_add_executable( stunserver
  SOURCES
    stunserver.cpp stunserver_main.cpp
  LINK
-    cricketbase-static cricketp2pbase-static pthread
+    cricketbase-static cricketp2pbase-static ${CMAKE_THREAD_LIBS_INIT}
  DESTINATION ${BIN_INSTALL_DIR}
 )
--- a/krfb/krfb/CMakeLists.txt
+++ b/krfb/krfb/CMakeLists.txt
@ -55,7 +55,8 @@ tde_add_executable( krfb AUTOMOC
    rfbcontroller.cpp xupdatescanner.cpp main.cpp connectionwidget.ui
    krfbifaceimpl.cpp krfbiface.skel trayicon.cpp connectiondialog.cpp
  LINK
-    krfbconfig-static tdevncserver-static srvloc-static tdeui-shared tdeio-shared jpeg Xext pthread ${XTST_LIBRARIES}
+    krfbconfig-static tdevncserver-static srvloc-static tdeui-shared tdeio-shared jpeg Xext
+    ${CMAKE_THREAD_LIBS_INIT} ${XTST_LIBRARIES}
  DESTINATION ${BIN_INSTALL_DIR}
 )