diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-10-18 23:39:52 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-10-18 23:56:58 +0200 |
| commit | 5728ee11b05c6ab177c8a5d4a5330b210a22e927 (patch) | |
| tree | ca44a27c6cc0ed15cdee1916b77e9ce42bbfc5a5 /ConfigureChecks.cmake | |
| parent | ff093aacb444803e5d7f3945e33e8ab1525544b4 (diff) | |
| download | kgtk-qt3-5728ee11b05c6ab177c8a5d4a5330b210a22e927.tar.gz kgtk-qt3-5728ee11b05c6ab177c8a5d4a5330b210a22e927.zip | |
Housekeeping in CMake rules:
+ Removed detailed DL library detection - the results were not used.
+ Added test whether the DL library contains _dl_sym function.
+ GTK presence test moved to ConfigureChecks.cmake.
+ Added GTHREAD presence test.
+ Used tde_add_library macro.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 06e967574741ce2f3b29ba4ed4d5e2629c47553c)
Diffstat (limited to 'ConfigureChecks.cmake')
| -rw-r--r-- | ConfigureChecks.cmake | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 1149770..cfd9cd0 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -39,30 +39,21 @@ check_include_file( linux/inotify.h HAVE_INOTIFY ) check_function_exists( statvfs HAVE_STATVFS ) check_function_exists( getpeereid HAVE_GETPEEREID ) -if ( BUILD_KGTK_GTK2 ) - # Check if we have dlvsym... - find_library(LIBDLVSYM_LIBRARY - NAMES dl - PATHS /lib /usr/lib /usr/X11R6/lib /usr/local/lib) - - if(LIBDLVSYM_LIBRARY) - set(HAVE_DLVSYM 1) - # Determine version of dlsym... - find_library(LIBDL_LIBRARY - NAMES dl - PATHS /lib /usr/lib /usr/X11R6/lib /usr/local/lib) - - if(LIBDL_LIBRARY) - execute_process(COMMAND objdump --dynamic-syms ${LIBDL_LIBRARY} - COMMAND grep dlsym - OUTPUT_VARIABLE DLSYM_DATA) - separate_arguments(DLSYM_DATA) - if (${CMAKE_MAJOR_VERSION} GREATER 2 OR ${CMAKE_MINOR_VERSION} GREATER 4) - cmake_policy(SET CMP0007 OLD) - endif (${CMAKE_MAJOR_VERSION} GREATER 2 OR ${CMAKE_MINOR_VERSION} GREATER 4) - list(GET DLSYM_DATA 4 KGTK_DLSYM_VERSION) - endif(LIBDL_LIBRARY) - else(LIBDLVSYM_LIBRARY) - message("** INFORMATION: You're libdl does not contain dlvsym - SWT apps will not be supported") - endif(LIBDLVSYM_LIBRARY) -endif () + +##### check for gtk+ 2.x + +if( BUILD_KGTK_GTK2 ) + + pkg_check_modules( GTK gtk+-2.0>=2.6 ) + pkg_check_modules( GTHREAD gthread-2.0 ) + + if( NOT GTK_FOUND OR NOT GTHREAD_FOUND ) + tde_message_fatal( "GTK2 support is requested but not found on your system" ) + endif() + + check_library_exists( "${CMAKE_DL_LIBS}" _dl_sym "" HAVE_DL_SYM ) + if( NOT HAVE_DL_SYM ) + tde_message_fatal( "The DL library seems no longer contains _dl_sym function" ) + endif() + +endif() |