mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use pkg-config first to find libraries

Browse Source
This commit is contained in:
Florent Le Coz
2014-05-30 13:15:13 +02:00
parent 86c6f36fae
commit 8eb9e535a3
2 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Modules/FindLibidn.cmake
+6 -1
View File
@@ -15,6 +15,10 @@
# #
# This file is in the public domain # This file is in the public domain
include(FindPkgConfig)
pkg_check_modules(LIBIDN libidn)
if(NOT LIBIDN_FOUND)
find_path(LIBIDN_INCLUDE_DIRS NAMES stringprep.h find_path(LIBIDN_INCLUDE_DIRS NAMES stringprep.h
DOC "The libidn include directory") DOC "The libidn include directory")
@@ -25,12 +29,13 @@ find_library(LIBIDN_LIBRARIES NAMES idn
# Use some standard module to handle the QUIETLY and REQUIRED arguments, and # Use some standard module to handle the QUIETLY and REQUIRED arguments, and
# set LIBIDN_FOUND to TRUE if these two variables are set. # set LIBIDN_FOUND to TRUE if these two variables are set.
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Libidn REQUIRED_VARS LIBIDN_LIBRARIES LIBIDN_INCLUDE_DIRS) find_package_handle_standard_args(LIBIDN REQUIRED_VARS LIBIDN_LIBRARIES LIBIDN_INCLUDE_DIRS)
# Compatibility for all the ways of writing these variables # Compatibility for all the ways of writing these variables
if(LIBIDN_FOUND) if(LIBIDN_FOUND)
set(LIBIDN_INCLUDE_DIR ${LIBIDN_INCLUDE_DIRS}) set(LIBIDN_INCLUDE_DIR ${LIBIDN_INCLUDE_DIRS})
set(LIBIDN_LIBRARY ${LIBIDN_LIBRARIES}) set(LIBIDN_LIBRARY ${LIBIDN_LIBRARIES})
endif() endif()
endif()
mark_as_advanced(LIBIDN_INCLUDE_DIRS LIBIDN_LIBRARIES) mark_as_advanced(LIBIDN_INCLUDE_DIRS LIBIDN_LIBRARIES)
cmake/Modules/FindSystemdDaemon.cmake
+7 -2
View File
@@ -15,20 +15,25 @@
# #
# This file is in the public domain # This file is in the public domain
include(FindPkgConfig)
pkg_check_modules(SYSTEMDDAEMON libsystemd-daemon)
if(NOT SYSTEMDDAEMON_FOUND)
find_path(SYSTEMDDAEMON_INCLUDE_DIRS NAMES systemd/sd-daemon.h find_path(SYSTEMDDAEMON_INCLUDE_DIRS NAMES systemd/sd-daemon.h
DOC "The Systemd Daemon include directory") DOC "The Systemd Daemon include directory")
find_library(SYSTEMDDAEMON_LIBRARIES NAMES systemd find_library(SYSTEMDDAEMON_LIBRARIES NAMES systemd-daemon systemd
DOC "The Systemd Daemon library") DOC "The Systemd Daemon library")
# Use some standard module to handle the QUIETLY and REQUIRED arguments, and # Use some standard module to handle the QUIETLY and REQUIRED arguments, and
# set SYSTEMDDAEMON_FOUND to TRUE if these two variables are set. # set SYSTEMDDAEMON_FOUND to TRUE if these two variables are set.
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SystemdDaemon REQUIRED_VARS SYSTEMDDAEMON_LIBRARIES SYSTEMDDAEMON_INCLUDE_DIRS) find_package_handle_standard_args(SYSTEMDDAEMON REQUIRED_VARS SYSTEMDDAEMON_LIBRARIES SYSTEMDDAEMON_INCLUDE_DIRS)
if(SYSTEMDDAEMON_FOUND) if(SYSTEMDDAEMON_FOUND)
set(SYSTEMDDAEMON_LIBRARY ${SYSTEMDDAEMON_LIBRARIES}) set(SYSTEMDDAEMON_LIBRARY ${SYSTEMDDAEMON_LIBRARIES})
set(SYSTEMDDAEMON_INCLUDE_DIR ${SYSTEMDDAEMON_INCLUDE_DIRS}) set(SYSTEMDDAEMON_INCLUDE_DIR ${SYSTEMDDAEMON_INCLUDE_DIRS})
endif() endif()
endif()
mark_as_advanced(SYSTEMDDAEMON_INCLUDE_DIRS SYSTEMDDAEMON_LIBRARIES) mark_as_advanced(SYSTEMDDAEMON_INCLUDE_DIRS SYSTEMDDAEMON_LIBRARIES)