diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt index 6b91bef8..d1107df1 100644 --- a/cmake/modules/CMakeLists.txt +++ b/cmake/modules/CMakeLists.txt @@ -8,8 +8,6 @@ set(module_install_dir ${DATA_INSTALL_DIR}/cmake/modules ) # are listed explicitly: set(cmakeFilesDontInstall FindHUpnp.cmake - FindPolkitQt.cmake - FindPolkitQt-1.cmake FindUDev.cmake ) @@ -51,7 +49,6 @@ set(cmakeFiles FindGettext.cmake FindGphoto2.cmake FindHUNSPELL.cmake - FindIOKit.cmake FindKDE4Internal.cmake FindKDE4Workspace.cmake FindKDevPlatform.cmake diff --git a/cmake/modules/FindPolkitQt-1.cmake b/cmake/modules/FindPolkitQt-1.cmake deleted file mode 100644 index 4e905378..00000000 --- a/cmake/modules/FindPolkitQt-1.cmake +++ /dev/null @@ -1,37 +0,0 @@ -# - Try to find PolkitQt-1 -# Once done this will define -# -# POLKITQT-1_FOUND - system has Polkit-qt -# POLKITQT-1_INCLUDE_DIR - the Polkit-qt include directory -# POLKITQT-1_LIBRARIES - Link these to use all Polkit-qt libs -# POLKITQT-1_CORE_LIBRARY - Link this to use the polkit-qt-core library only -# POLKITQT-1_GUI_LIBRARY - Link this to use GUI elements in polkit-qt (polkit-qt-gui) -# POLKITQT-1_AGENT_LIBRARY - Link this to use the agent wrapper in polkit-qt -# POLKITQT-1_DEFINITIONS - Compiler switches required for using Polkit-qt -# -# The minimum required version of PolkitQt-1 can be specified using the -# standard syntax, e.g. find_package(PolkitQt-1 1.0) - -# Copyright (c) 2009, Dario Freddi, -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -# Support POLKITQT-1_MIN_VERSION for compatibility: -if ( NOT PolkitQt-1_FIND_VERSION AND POLKITQT-1_MIN_VERSION ) - set ( PolkitQt-1_FIND_VERSION ${POLKITQT-1_MIN_VERSION} ) -endif ( NOT PolkitQt-1_FIND_VERSION AND POLKITQT-1_MIN_VERSION ) - -set( _PolkitQt-1_FIND_QUIETLY ${PolkitQt-1_FIND_QUIETLY} ) -find_package( PolkitQt-1 ${PolkitQt-1_FIND_VERSION} QUIET NO_MODULE PATHS ${LIB_INSTALL_DIR}/PolkitQt-1/cmake ) -set( PolkitQt-1_FIND_QUIETLY ${_PolkitQt-1_FIND_QUIETLY} ) - -include( FindPackageHandleStandardArgs ) -find_package_handle_standard_args( PolkitQt-1 DEFAULT_MSG PolkitQt-1_CONFIG ) - -if (POLKITQT-1_FOUND) - if (NOT POLKITQT-1_INSTALL_DIR STREQUAL CMAKE_INSTALL_PREFIX) - message("WARNING: Installation prefix does not match PolicyKit install prefixes. You probably will need to move files installed " - "in POLICY_FILES_INSTALL_DIR and by dbus_add_activation_system_service to the ${PC_POLKITQT-1_PREFIX} prefix") - endif (NOT POLKITQT-1_INSTALL_DIR STREQUAL CMAKE_INSTALL_PREFIX) -endif (POLKITQT-1_FOUND) diff --git a/cmake/modules/FindPolkitQt.cmake b/cmake/modules/FindPolkitQt.cmake deleted file mode 100644 index ca6ee841..00000000 --- a/cmake/modules/FindPolkitQt.cmake +++ /dev/null @@ -1,94 +0,0 @@ -# - Try to find Polkit-qt -# Once done this will define -# -# POLKITQT_FOUND - system has Polkit-qt -# POLKITQT_INCLUDE_DIR - the Polkit-qt include directory -# POLKITQT_LIBRARIES - Link these to use all Polkit-qt libs -# POLKITQT_CORE_LIBRARY - Link this to use the polkit-qt-core library only -# POLKITQT_GUI_LIBRARY - Link this to use GUI elements in polkit-qt (polkit-qt-gui) -# POLKITQT_DEFINITIONS - Compiler switches required for using Polkit-qt -# POLKITQT_POLICY_FILES_INSTALL_DIR - The directory where policy files should be installed to. -# -# The minimum required version of PolkitQt can be specified using the -# standard syntax, e.g. find_package(PolkitQt 1.0) -# For compatibility, this can also be done by setting the POLKITQT_MIN_VERSION variable. - -# Copyright (c) 2009, Daniel Nicoletti, -# Copyright (c) 2009, Dario Freddi, -# Copyright (c) 2009, Michal Malek, -# Copyright (c) 2009, Alexander Neundorf, -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - -# Support POLKITQT_MIN_VERSION for compatibility: -if(NOT PolkitQt_FIND_VERSION) - set(PolkitQt_FIND_VERSION "${POLKITQT_MIN_VERSION}") -endif(NOT PolkitQt_FIND_VERSION) - -# the minimum version of PolkitQt we require -if(NOT PolkitQt_FIND_VERSION) - set(PolkitQt_FIND_VERSION "0.9.3") -endif(NOT PolkitQt_FIND_VERSION) - -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_check_modules(PC_POLKITQT QUIET polkit-qt) - set(POLKITQT_DEFINITIONS ${PC_POLKITQT_CFLAGS_OTHER}) -endif (NOT WIN32) - -find_path( POLKITQT_INCLUDE_DIR - NAMES polkit-qt/auth.h - PATH_SUFFIXES PolicyKit -) - -find_file( POLKITQT_VERSION_FILE - polkit-qt/polkitqtversion.h - HINTS ${POLKITQT_INCLUDE_DIR} -) - -if(POLKITQT_VERSION_FILE AND NOT POLKITQT_VERSION) - file(READ ${POLKITQT_VERSION_FILE} POLKITQT_VERSION_CONTENT) - string (REGEX MATCH "POLKITQT_VERSION_STRING \".*\"\n" POLKITQT_VERSION_MATCH "${POLKITQT_VERSION_CONTENT}") - - if(POLKITQT_VERSION_MATCH) - string(REGEX REPLACE "POLKITQT_VERSION_STRING \"(.*)\"\n" "\\1" _POLKITQT_VERSION ${POLKITQT_VERSION_MATCH}) - endif(POLKITQT_VERSION_MATCH) - set(POLKITQT_VERSION "${_POLKITQT_VERSION}" CACHE STRING "Version number of PolkitQt" FORCE) -endif(POLKITQT_VERSION_FILE AND NOT POLKITQT_VERSION) - -find_library( POLKITQT_CORE_LIBRARY - NAMES polkit-qt-core - HINTS ${PC_POLKITQT_LIBDIR} -) -find_library( POLKITQT_GUI_LIBRARY - NAMES polkit-qt-gui - HINTS ${PC_POLKITQT_LIBDIR} -) -set(POLKITQT_LIBRARIES ${POLKITQT_GUI_LIBRARY} ${POLKITQT_CORE_LIBRARY}) - -include(FindPackageHandleStandardArgs) -# Use the extended (new) syntax for FPHSA(): -find_package_handle_standard_args(PolkitQt REQUIRED_VARS POLKITQT_GUI_LIBRARY POLKITQT_CORE_LIBRARY POLKITQT_INCLUDE_DIR - VERSION_VAR POLKITQT_VERSION) - -mark_as_advanced(POLKITQT_INCLUDE_DIR - POLKITQT_CORE_LIBRARY - POLKITQT_GUI_LIBRARY - POLKITQT_VERSION_FILE - ) - -set(POLKITQT_POLICY_FILES_INSTALL_DIR share/PolicyKit/policy/) - -if(POLKITQT_FOUND) - get_filename_component(_POLKITQT_INSTALL_PREFIX "${POLKITQT_CORE_LIBRARY}" PATH) - get_filename_component(_POLKITQT_INSTALL_PREFIX "${_POLKITQT_INSTALL_PREFIX}" PATH) - if ( NOT _POLKITQT_INSTALL_PREFIX STREQUAL CMAKE_INSTALL_PREFIX ) - message("WARNING: Installation prefix does not match PolicyKit install prefixes. You probably will need to move files installed " - "in ${CMAKE_INSTALL_PREFIX}/${POLKITQT_POLICY_FILES_INSTALL_DIR} and by dbus_add_activation_system_service to the ${_POLKITQT_INSTALL_PREFIX}/${POLKITQT_POLICY_FILES_INSTALL_DIR} prefix") - endif (NOT _POLKITQT_INSTALL_PREFIX STREQUAL CMAKE_INSTALL_PREFIX) -endif(POLKITQT_FOUND) -