From 16a089bd4b27c65c4b1545c18950d04ed798adc2 Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Sun, 26 Sep 2010 19:56:34 +0000 Subject: support version # svn path=/trunk/KDE/kdelibs/; revision=1180034 --- modules/FindDBusMenuQt.cmake | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'modules/FindDBusMenuQt.cmake') diff --git a/modules/FindDBusMenuQt.cmake b/modules/FindDBusMenuQt.cmake index 82673b7d..337a4aff 100644 --- a/modules/FindDBusMenuQt.cmake +++ b/modules/FindDBusMenuQt.cmake @@ -18,18 +18,25 @@ include(FindPackageHandleStandardArgs) find_package(PkgConfig) -pkg_check_modules(PC_DBUSMENUQT QUIET dbusmenu-qt) -set(DBUSMENUQT_DEFINITIONS ${PC_DBUSMENUQT_CFLAGS_OTHER}) - -find_library(DBUSMENUQT_LIBRARIES - NAMES dbusmenu-qt dbusmenu-qtd - HINTS ${PC_DBUSMENUQT_LIBDIR} ${PC_DBUSMENUQT_LIBRARY_DIRS} - ) - -find_path(DBUSMENUQT_INCLUDE_DIR dbusmenuexporter.h - HINTS ${PC_DBUSMENUQT_INCLUDEDIR} ${PC_DBUSMENUQT_INCLUDE_DIRS} - PATH_SUFFIXES dbusmenu-qt - ) +if (DBusMenuQt_FIND_VERSION) + pkg_check_modules(PC_DBUSMENUQT QUIET dbusmenu-qt dbusmenu-qt>=${DBusMenuQt_FIND_VERSION}) +else(DBusMenuQt_FIND_VERSION) + pkg_check_modules(PC_DBUSMENUQT QUIET dbusmenu-qt) +endif(DBusMenuQt_FIND_VERSION) + +if(PC_DBUSMENUQT_FOUND) + set(DBUSMENUQT_DEFINITIONS ${PC_DBUSMENUQT_CFLAGS_OTHER}) + + find_library(DBUSMENUQT_LIBRARIES + NAMES dbusmenu-qt dbusmenu-qtd + HINTS ${PC_DBUSMENUQT_LIBDIR} ${PC_DBUSMENUQT_LIBRARY_DIRS} + ) + + find_path(DBUSMENUQT_INCLUDE_DIR dbusmenuexporter.h + HINTS ${PC_DBUSMENUQT_INCLUDEDIR} ${PC_DBUSMENUQT_INCLUDE_DIRS} + PATH_SUFFIXES dbusmenu-qt + ) +endif(PC_DBUSMENUQT_FOUND) find_package_handle_standard_args(DBusMenuQt "Could not find dbusmenu-qt; available at https://launchpad.net/libdbusmenu-qt/" DBUSMENUQT_LIBRARIES DBUSMENUQT_INCLUDE_DIR) -- cgit v1.2.1