From e4213f01b9eaa5100c31d497f15d87695d18f4cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 5 Oct 2014 14:44:34 +0200 Subject: [PATCH] Fix hardcoded link flag to "dl" library Fix "dlopen" function detection (cherry picked from commit af2c2afb25ce2b62767cdc639cf6d0c4fb967eaa) --- CMakeLists.txt | 13 +++++++++---- kstyles/kthemestyle/CMakeLists.txt | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e8b2ff73b..ea892a911 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -463,10 +463,15 @@ set( kde_socklen_t socklen_t ) ##### check for libdl ########################### -find_library( HAVE_LIBDL dl ) -if( NOT HAVE_LIBDL-NOTFOUND ) - set( DL_LIBRARIES dl ) -endif( NOT HAVE_LIBDL-NOTFOUND ) +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 ) ##### check for utempter ######################## diff --git a/kstyles/kthemestyle/CMakeLists.txt b/kstyles/kthemestyle/CMakeLists.txt index 9bfb5cb17..bf6cc0317 100644 --- a/kstyles/kthemestyle/CMakeLists.txt +++ b/kstyles/kthemestyle/CMakeLists.txt @@ -36,6 +36,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdefx-shared kdecore-shared dl + LINK kdefx-shared kdecore-shared ${DL_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles )