diff options
| -rw-r--r-- | CMakeLists.txt | 24 | ||||
| -rw-r--r-- | tdeprint/cups/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdeprint/lpr/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdestyles/kthemestyle/CMakeLists.txt | 2 |
4 files changed, 6 insertions, 24 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 41a4ed3ad..7f7acf0b7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -487,14 +487,10 @@ check_function_exists( madvise HAVE_MADVISE ) check_function_exists( getgroups HAVE_GETGROUPS ) check_symbol_exists( posix_fadvise "fcntl.h" HAVE_FADVISE ) check_function_exists( getcwd HAVE_GETCWD ) +tde_save_and_set( CMAKE_REQUIRED_LIBRARIES ${CMAKE_DL_LIBS} ) +check_function_exists( dlopen HAVE_LIBDL check_function_exists( dlerror HAVE_DLERROR ) -if( NOT HAVE_DLERROR ) - check_library_exists( dl dlerror "" HAVE_DLERROR_LIB ) - if( HAVE_DLERROR_LIB ) - set( HAVE_DLERROR 1 ) - set( DLERROR_LIBRARIES dl ) - endif( HAVE_DLERROR_LIB ) -endif( NOT HAVE_DLERROR ) +tde_restore( CMAKE_REQUIRED_LIBRARIES ) check_function_exists( crypt HAVE_CRYPT ) if( NOT HAVE_CRYPT ) check_library_exists( crypt crypt "" HAVE_CRYPT_LIB ) @@ -652,20 +648,6 @@ if( WITH_TDEHWLIB ) endif( WITH_TDEHWLIB ) -##### check for libdl ########################### - -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_library_exists( dld, dld_link "" HAVE_DLD ) - - ##### check for magic ########################### set( MAGIC_LIBRARIES magic ) diff --git a/tdeprint/cups/CMakeLists.txt b/tdeprint/cups/CMakeLists.txt index 831c4db83..0cf2fd1e0 100644 --- a/tdeprint/cups/CMakeLists.txt +++ b/tdeprint/cups/CMakeLists.txt @@ -82,7 +82,7 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK driverparse-static tdefakes-shared ${ZLIB_LIBRARIES} ${DL_LIBRARIES} ${TQT_LIBRARIES} + LINK driverparse-static tdefakes-shared ${ZLIB_LIBRARIES} ${CMAKE_DL_LIBS} ${TQT_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdeprint/lpr/CMakeLists.txt b/tdeprint/lpr/CMakeLists.txt index dfd932150..a6f9efafc 100644 --- a/tdeprint/lpr/CMakeLists.txt +++ b/tdeprint/lpr/CMakeLists.txt @@ -80,6 +80,6 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK driverparse-static tdefakes-shared ${DL_LIBRARIES} + LINK driverparse-static tdefakes-shared ${CMAKE_DL_LIBS} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdestyles/kthemestyle/CMakeLists.txt b/tdestyles/kthemestyle/CMakeLists.txt index 8a1bd2a8c..e6673004f 100644 --- a/tdestyles/kthemestyle/CMakeLists.txt +++ b/tdestyles/kthemestyle/CMakeLists.txt @@ -36,6 +36,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK tdefx-shared tdecore-shared ${DL_LIBRARIES} + LINK tdefx-shared tdecore-shared ${CMAKE_DL_LIBS} DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles ) |