diff options
| author | Florent Le Coz <louiz@louiz.org> | 2014-05-30 13:12:33 +0200 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2014-05-30 13:15:13 +0200 |
| commit | 8eb9e535a3514a7d9254819f499dcb169c56b51e (patch) | |
| tree | 6c8e9ab985abbc8b8f18a372fa75e7b2a8a9d85c | |
| parent | 86c6f36faebadfc028ea5f9c64e5769fb0f77170 (diff) | |
| download | biboumi-8eb9e535a3514a7d9254819f499dcb169c56b51e.tar.gz biboumi-8eb9e535a3514a7d9254819f499dcb169c56b51e.tar.bz2 biboumi-8eb9e535a3514a7d9254819f499dcb169c56b51e.tar.xz biboumi-8eb9e535a3514a7d9254819f499dcb169c56b51e.zip | |
Use pkg-config first to find libraries
| -rw-r--r-- | cmake/Modules/FindLibidn.cmake | 31 | ||||
| -rw-r--r-- | cmake/Modules/FindSystemdDaemon.cmake | 27 |
2 files changed, 34 insertions, 24 deletions
diff --git a/cmake/Modules/FindLibidn.cmake b/cmake/Modules/FindLibidn.cmake index 5434127..611a6a8 100644 --- a/cmake/Modules/FindLibidn.cmake +++ b/cmake/Modules/FindLibidn.cmake @@ -15,22 +15,27 @@ # # This file is in the public domain -find_path(LIBIDN_INCLUDE_DIRS NAMES stringprep.h - DOC "The libidn include directory") +include(FindPkgConfig) +pkg_check_modules(LIBIDN libidn) -# The library containing the stringprep module is libidn -find_library(LIBIDN_LIBRARIES NAMES idn - DOC "The libidn library") +if(NOT LIBIDN_FOUND) + find_path(LIBIDN_INCLUDE_DIRS NAMES stringprep.h + DOC "The libidn include directory") -# Use some standard module to handle the QUIETLY and REQUIRED arguments, and -# set LIBIDN_FOUND to TRUE if these two variables are set. -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Libidn REQUIRED_VARS LIBIDN_LIBRARIES LIBIDN_INCLUDE_DIRS) + # The library containing the stringprep module is libidn + find_library(LIBIDN_LIBRARIES NAMES idn + DOC "The libidn library") -# Compatibility for all the ways of writing these variables -if(LIBIDN_FOUND) - set(LIBIDN_INCLUDE_DIR ${LIBIDN_INCLUDE_DIRS}) - set(LIBIDN_LIBRARY ${LIBIDN_LIBRARIES}) + # Use some standard module to handle the QUIETLY and REQUIRED arguments, and + # set LIBIDN_FOUND to TRUE if these two variables are set. + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(LIBIDN REQUIRED_VARS LIBIDN_LIBRARIES LIBIDN_INCLUDE_DIRS) + + # Compatibility for all the ways of writing these variables + if(LIBIDN_FOUND) + set(LIBIDN_INCLUDE_DIR ${LIBIDN_INCLUDE_DIRS}) + set(LIBIDN_LIBRARY ${LIBIDN_LIBRARIES}) + endif() endif() mark_as_advanced(LIBIDN_INCLUDE_DIRS LIBIDN_LIBRARIES)
\ No newline at end of file diff --git a/cmake/Modules/FindSystemdDaemon.cmake b/cmake/Modules/FindSystemdDaemon.cmake index 441ac47..9492bf2 100644 --- a/cmake/Modules/FindSystemdDaemon.cmake +++ b/cmake/Modules/FindSystemdDaemon.cmake @@ -15,20 +15,25 @@ # # This file is in the public domain -find_path(SYSTEMDDAEMON_INCLUDE_DIRS NAMES systemd/sd-daemon.h - DOC "The Systemd Daemon include directory") +include(FindPkgConfig) +pkg_check_modules(SYSTEMDDAEMON libsystemd-daemon) -find_library(SYSTEMDDAEMON_LIBRARIES NAMES systemd - DOC "The Systemd Daemon library") +if(NOT SYSTEMDDAEMON_FOUND) + find_path(SYSTEMDDAEMON_INCLUDE_DIRS NAMES systemd/sd-daemon.h + DOC "The Systemd Daemon include directory") -# Use some standard module to handle the QUIETLY and REQUIRED arguments, and -# set SYSTEMDDAEMON_FOUND to TRUE if these two variables are set. -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(SystemdDaemon REQUIRED_VARS SYSTEMDDAEMON_LIBRARIES SYSTEMDDAEMON_INCLUDE_DIRS) + find_library(SYSTEMDDAEMON_LIBRARIES NAMES systemd-daemon systemd + DOC "The Systemd Daemon library") -if(SYSTEMDDAEMON_FOUND) - set(SYSTEMDDAEMON_LIBRARY ${SYSTEMDDAEMON_LIBRARIES}) - set(SYSTEMDDAEMON_INCLUDE_DIR ${SYSTEMDDAEMON_INCLUDE_DIRS}) + # Use some standard module to handle the QUIETLY and REQUIRED arguments, and + # set SYSTEMDDAEMON_FOUND to TRUE if these two variables are set. + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(SYSTEMDDAEMON REQUIRED_VARS SYSTEMDDAEMON_LIBRARIES SYSTEMDDAEMON_INCLUDE_DIRS) + + if(SYSTEMDDAEMON_FOUND) + set(SYSTEMDDAEMON_LIBRARY ${SYSTEMDDAEMON_LIBRARIES}) + set(SYSTEMDDAEMON_INCLUDE_DIR ${SYSTEMDDAEMON_INCLUDE_DIRS}) + endif() endif() mark_as_advanced(SYSTEMDDAEMON_INCLUDE_DIRS SYSTEMDDAEMON_LIBRARIES)
\ No newline at end of file |