[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libmm-qt] /: Use pkg-config to find ModemManager.
From:       Lamarque V. Souza <lamarque () kde ! org>
Date:       2013-09-30 19:38:53
Message-ID: E1VQjIz-0001K7-FC () scm ! kde ! org
[Download RAW message or body]

Git commit c2e805ced7ea6b39656eecca777b13d5185f69ff by Lamarque V. Souza.
Committed on 30/09/2013 at 19:23.
Pushed by lvsouza into branch 'master'.

Use pkg-config to find ModemManager.

M  +3    -1    CMakeLists.txt
D  +0    -42   FindModemManager.cmake
M  +2    -2    ModemManagerQt.pc.cmake

http://commits.kde.org/libmm-qt/c2e805ced7ea6b39656eecca777b13d5185f69ff

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ccc672b..7da7cda 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.8)
 
 project(ModemManagerQt)
 
+include(FindPkgConfig)
+
 set(VERSION 0.7.991)
 set(CMAKE_BUILD_TYPE Debug)
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH})
@@ -9,7 +11,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH})
 set(LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
 
 find_package(Qt4 REQUIRED)
-find_package(ModemManager 0.7.990 REQUIRED)
+pkg_check_modules(MODEMMANAGER REQUIRED ModemManager>=0.8)
 
 add_definitions(${QT_DEFINITIONS})
 
diff --git a/FindModemManager.cmake b/FindModemManager.cmake
deleted file mode 100644
index 7f13087..0000000
--- a/FindModemManager.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-# - Try to find ModemManager
-# Once done this will define
-#
-#  MODEMMANAGER_FOUND - system has ModemManager
-#  MODEMMANAGER_INCLUDE_DIRS - the ModemManager include directories
-#  MODEMMANAGER_LIBRARIES - the libraries needed to use ModemManager
-#  MODEMMANAGER_CFLAGS - Compiler switches required for using ModemManager
-#  MODEMMANAGER_VERSION - version number of ModemManager
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
-# Copyright (c) 2007, Will Stephenson, <wstephenson@kde.org>
-# Copyright (c) 2013, Lukas Tinkl, <ltinkl@redhat.com>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-
-IF (MODEMMANAGER_INCLUDE_DIRS)
-   # in cache already
-   SET(NetworkManager_FIND_QUIETLY TRUE)
-ENDIF (MODEMMANAGER_INCLUDE_DIRS)
-
-IF (NOT WIN32)
-   # use pkg-config to get the directories and then use these values
-   # in the FIND_PATH() and FIND_LIBRARY() calls
-   find_package(PkgConfig)
-   PKG_SEARCH_MODULE( MODEMMANAGER ModemManager )
-ENDIF (NOT WIN32)
-
-IF (MODEMMANAGER_FOUND)
-   IF (ModemManager_FIND_VERSION AND ("${MODEMMANAGER_VERSION}" VERSION_LESS "${ModemManager_FIND_VERSION}"))
-      MESSAGE(FATAL_ERROR "ModemManager ${MODEMMANAGER_VERSION} is too old, need at least ${ModemManager_FIND_VERSION}")
-   ELSEIF (NOT ModemManager_FIND_QUIETLY)
-      MESSAGE(STATUS "Found ModemManager ${MODEMMANAGER_VERSION}: ${MODEMMANAGER_INCLUDE_DIRS}")
-   ENDIF()
-ELSE (MODEMMANAGER_FOUND)
-   IF (ModemManager_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could NOT find ModemManager, check FindPkgConfig output above!")
-   ENDIF (ModemManager_FIND_REQUIRED)
-ENDIF (MODEMMANAGER_FOUND)
-
-MARK_AS_ADVANCED(MODEMMANAGER_INCLUDE_DIRS)
diff --git a/ModemManagerQt.pc.cmake b/ModemManagerQt.pc.cmake
index ad46bd8..ea7c1e0 100644
--- a/ModemManagerQt.pc.cmake
+++ b/ModemManagerQt.pc.cmake
@@ -26,5 +26,5 @@ Description: Convenience Qt library for clients of ModemManager
 Version: @VERSION@
 
 Requires: QtCore QtDBus QtXml
-Cflags: -I${includedir} @CMAKE_INCLUDE_PATH@
-Libs: -L${libdir} -lModemManagerQt @CMAKE_LIBRARY_PATH@
+Cflags: -I${includedir} -I@MODEMMANAGER_INCLUDE_DIRS@
+Libs: -L${libdir} -lModemManagerQt
[prev in list] [next in list] [prev in thread] [next in thread]