diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ConfigureChecks.cmake | 13 | ||||
| -rw-r--r-- | arts/builder/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | arts/gui/common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | arts/modules/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | arts/runtime/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | krec/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kscd/libwm/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | mpeglib/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | noatun/library/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | xine_artsplugin/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | xine_artsplugin/tools/thumbnail/CMakeLists.txt | 2 |
12 files changed, 13 insertions, 25 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a4ae664..d5054b54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,7 @@ enable_testing( ) ##### include essential cmake modules ########### include( FindPkgConfig ) +include( FindThreads ) include( CheckIncludeFile ) include( CheckIncludeFileCXX ) include( CheckTypeSize ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 16381307..5ffb8e27 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -97,19 +97,6 @@ check_include_file( sys/soundcard.h HAVE_SYS_SOUNDCARD_H ) check_include_file( machine/soundcard.h HAVE_MACHINE_SOUNDCARD_H ) -##### check libraries ########################### - -set( DL_LIBRARIES dl ) -check_library_exists( ${DL_LIBRARIES} dlopen /lib HAVE_LIBDL ) -if( NOT HAVE_LIBDL ) - unset( DL_LIBRARIES ) - check_function_exists( dlopen HAVE_DLOPEN ) - if( HAVE_DLOPEN ) - set( HAVE_LIBDL 1 ) - endif( HAVE_DLOPEN ) -endif( NOT HAVE_LIBDL ) - - # ALSA if( WITH_ALSA ) pkg_check_modules( ALSA alsa>=0.5 ) diff --git a/arts/builder/CMakeLists.txt b/arts/builder/CMakeLists.txt index a8611e27..62e2c0c3 100644 --- a/arts/builder/CMakeLists.txt +++ b/arts/builder/CMakeLists.txt @@ -39,7 +39,7 @@ tde_add_executable( artsbuilder AUTOMOC execdlg.cpp qttableview.cpp interfacedlg.cpp LINK tdecore-shared tdeui-shared tdeio-shared artsbuilder-shared artskde-shared - mcop qtmcop artsflow_idl soundserver_idl pthread + mcop qtmcop artsflow_idl soundserver_idl ${CMAKE_THREAD_LIBS_INIT} DEPENDENCIES arts_builder_headers DESTINATION ${BIN_INSTALL_DIR} diff --git a/arts/gui/common/CMakeLists.txt b/arts/gui/common/CMakeLists.txt index 030e3c65..8c7d45ad 100644 --- a/arts/gui/common/CMakeLists.txt +++ b/arts/gui/common/CMakeLists.txt @@ -29,7 +29,7 @@ link_directories( tde_add_library( artsgui_idl SHARED SOURCES artsgui.cpp VERSION 0.0.0 - LINK mcop ${DL_LIBRARIES} ${ARTS_LIBRARIES} + LINK mcop ${CMAKE_DL_LIBS} ${ARTS_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/arts/modules/CMakeLists.txt b/arts/modules/CMakeLists.txt index fb6d07e2..0cc76da1 100644 --- a/arts/modules/CMakeLists.txt +++ b/arts/modules/CMakeLists.txt @@ -42,7 +42,7 @@ tde_add_library( artsmodules SHARED artsmodules.cpp VERSION 0.0.0 LINK - tdecore-shared ${DL_LIBRARIES} mcop artsflow + tdecore-shared ${CMAKE_DL_LIBS} mcop artsflow artsbuilder-shared artsgui_idl-shared artsmidi_idl-shared artsmodulescommon-shared artsmodulessynth-shared artsmoduleseffects-shared artsmodulesmixers-shared diff --git a/arts/runtime/CMakeLists.txt b/arts/runtime/CMakeLists.txt index ac8692c4..c36e1e11 100644 --- a/arts/runtime/CMakeLists.txt +++ b/arts/runtime/CMakeLists.txt @@ -36,7 +36,7 @@ tde_add_library( artsbuilder SHARED compatibility.cpp localfactory_impl.cpp artsbuilderloader_impl.cpp VERSION 0.0.0 LINK - mcop artsflow artsflow_idl ${DL_LIBRARIES} ${ARTS_LIBRARIES} + mcop artsflow artsflow_idl ${CMAKE_DL_LIBS} ${ARTS_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/krec/CMakeLists.txt b/krec/CMakeLists.txt index c5aadced..2c867eb6 100644 --- a/krec/CMakeLists.txt +++ b/krec/CMakeLists.txt @@ -62,8 +62,8 @@ tde_add_tdeinit_executable( krec AUTOMOC tdeutils-shared tdetexteditor-shared mcop kmedia2_idl soundserver_idl artsflow_idl artsmoduleseffects-shared artscontrolsupport-shared artsgui_kde-shared - krec_common-static ${DL_LIBRARIES} artskde-shared - ${ARTSC_LIBRARIES} pthread + krec_common-static ${CMAKE_DL_LIBS} artskde-shared + ${ARTSC_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/kscd/libwm/CMakeLists.txt b/kscd/libwm/CMakeLists.txt index 4613f544..d3816c9e 100644 --- a/kscd/libwm/CMakeLists.txt +++ b/kscd/libwm/CMakeLists.txt @@ -34,5 +34,5 @@ tde_add_library( workman STATIC_PIC EMBED workmanaudio-static LINK - ${ALSA_LIBRARIES} pthread + ${ALSA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/mpeglib/lib/CMakeLists.txt b/mpeglib/lib/CMakeLists.txt index ad500d03..7b3dab41 100644 --- a/mpeglib/lib/CMakeLists.txt +++ b/mpeglib/lib/CMakeLists.txt @@ -63,7 +63,7 @@ tde_add_library( mpeg SHARED mcop kmedia2_idl soundserver_idl artsflow_idl artsmodules-shared X11 ${XEXT_LIBRARIES} m ${XV_LIBRARIES} ${DGA_LIBRARIES} ${XVIDMODE_LIBRARIES} ${CDPARANOIA_LIBRARIES} ${OGG_LIBRARIES} ${VORBIS_LIBRARIES} ${VORBISFILE_LIBRARIES} - pthread + ${CMAKE_THREAD_LIBS_INIT} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/noatun/library/CMakeLists.txt b/noatun/library/CMakeLists.txt index 69b9cdd0..0be30314 100644 --- a/noatun/library/CMakeLists.txt +++ b/noatun/library/CMakeLists.txt @@ -58,7 +58,7 @@ tde_add_library( noatun SHARED AUTOMOC ${CMAKE_CURRENT_SOURCE_DIR}/noatun VERSION 1.2.0 LINK - DCOP-shared tdeio-shared artskde-shared ${DL_LIBRARIES} + DCOP-shared tdeio-shared artskde-shared ${CMAKE_DL_LIBS} ${NOATUN_ARTS_LIBRARIES} mcop qtmcop kmedia2_idl soundserver_idl artsflow noatunarts-shared @@ -75,7 +75,7 @@ tde_add_library( noatuncontrols SHARED AUTOMOC ${CMAKE_CURRENT_SOURCE_DIR}/noatun VERSION 1.2.0 LINK - tdecore-shared tdeui-shared ${DL_LIBRARIES} + tdecore-shared tdeui-shared ${CMAKE_DL_LIBS} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/xine_artsplugin/CMakeLists.txt b/xine_artsplugin/CMakeLists.txt index 0b647c96..4b69798f 100644 --- a/xine_artsplugin/CMakeLists.txt +++ b/xine_artsplugin/CMakeLists.txt @@ -39,7 +39,7 @@ tde_add_library( arts_xine SHARED AUTOMOC VERSION 0.0.0 LINK mcop kmedia2_idl soundserver_idl artsflow artsflow_idl - ${ARTS_LIBRARIES} ${XINE_LIBRARIES} ${XEXT_LIBRARIES} X11 pthread + ${ARTS_LIBRARIES} ${XINE_LIBRARIES} ${XEXT_LIBRARIES} X11 ${CMAKE_THREAD_LIBS_INIT} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/xine_artsplugin/tools/thumbnail/CMakeLists.txt b/xine_artsplugin/tools/thumbnail/CMakeLists.txt index 4dbc9502..ac77313e 100644 --- a/xine_artsplugin/tools/thumbnail/CMakeLists.txt +++ b/xine_artsplugin/tools/thumbnail/CMakeLists.txt @@ -31,7 +31,7 @@ tde_add_kpart( videothumbnail AUTOMOC SOURCES videocreator.cpp videoscaler.cpp LINK - tdecore-shared ${XINE_LIBRARIES} pthread + tdecore-shared ${XINE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} DESTINATION ${PLUGIN_INSTALL_DIR} ) |