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

List:       kde-commits
Subject:    extragear/multimedia/k3b
From:       Michal Malek <michalm () jabster ! pl>
Date:       2009-04-15 21:33:34
Message-ID: 1239831214.858676.15511.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 954544 by mmalek:

* improved Policykit-Qt detection:
  - replaced deprecated module UsePkgConfig with FindPkgConfig
  - detecting actual D-BUS prefix in "dbus_add_activation_system_service" macro
* install K3bSetup dbus configuration file in ${KDE4_SYSCONF_INSTALL_DIR} directory

 M  +44 -49    cmake/modules/FindPolkitQt.cmake  
 M  +4 -4      k3bsetup/worker/CMakeLists.txt  


--- trunk/extragear/multimedia/k3b/cmake/modules/FindPolkitQt.cmake #954543:954544
@@ -11,80 +11,75 @@
 # Copyright (c) 2008, Adrien Bustany, <madcat@mymadcat.com>
 # Copyright (c) 2009, Daniel Nicoletti, <dantti85-pk@yahoo.com.br>
 # Copyright (c) 2009, Dario Freddi, <drf54321@gmail.com>
+# Copyright (c) 2009, Michal Malek, <michalm@jabster.pl>
 #
 # Redistribution and use is allowed according to the terms of the GPLv2+ license.
 
-IF (POLKITQT_INCLUDE_DIR AND POLKITQT_LIB)
-    SET(POLKITQT_FIND_QUIETLY TRUE)
-ENDIF (POLKITQT_INCLUDE_DIR AND POLKITQT_LIB)
+if (POLKITQT_INCLUDE_DIR AND POLKITQT_LIB)
+    set(POLKITQT_FIND_QUIETLY TRUE)
+endif (POLKITQT_INCLUDE_DIR AND POLKITQT_LIB)
 
-include(UsePkgConfig)
+include(FindPkgConfig)
 
-if(NOT POLKITQT_MIN_VERSION)
+if (NOT POLKITQT_MIN_VERSION)
   set(POLKITQT_MIN_VERSION "0.9.0")
-endif(NOT POLKITQT_MIN_VERSION)
-  
-pkgconfig(polkit-qt-core _PQTIncDir _PQTLinkDir _PQTLinkFlags _PQTCflags)
+endif (NOT POLKITQT_MIN_VERSION)
 
-if(_PQTLinkFlags)
-  # query pkg-config asking for a Polkit >= ${POLKITQT_MIN_VERSION}
-  exec_program(${PKGCONFIG_EXECUTABLE} ARGS \
--atleast-version=${POLKITQT_MIN_VERSION} polkit-qt-core RETURN_VALUE _return_VALUE \
                OUTPUT_VARIABLE _pkgconfigDevNull )
-  if(_return_VALUE STREQUAL "0")
-    message(STATUS "Found Polkit-Qt release >= ${POLKITQT_MIN_VERSION}")
-  else(_return_VALUE STREQUAL "0")
-    message(STATUS "Found Polkit-Qt release < ${POLKITQT_MIN_VERSION}")
-    message(STATUS "You need Polkit-Qt version ${POLKITQT_MIN_VERSION} or newer to \
compile this component") +pkg_search_module( POLKITQT REQUIRED polkit-qt )
+
+if (POLKITQT_FOUND)
+    if (POLKITQT_VERSION VERSION_LESS POLKITQT_MIN_VERSION)
+        message(STATUS "Found Polkit-Qt release < ${POLKITQT_MIN_VERSION}")
+        message(STATUS "You need Polkit-Qt version ${POLKITQT_MIN_VERSION} or newer \
to compile this component") +        set(POLKITQT_FOUND FALSE)
+        return()
+    else (POLKITQT_VERSION VERSION_LESS POLKITQT_MIN_VERSION)
+        message(STATUS "Found Polkit-Qt release >= ${POLKITQT_MIN_VERSION}")
+    endif (POLKITQT_VERSION VERSION_LESS POLKITQT_MIN_VERSION)
+else (POLKITQT_FOUND)
     set(POLKITQT_FOUND FALSE)
-    return()
-  endif(_return_VALUE STREQUAL "0")
-else(_PQTLinkFlags)
-    set(POLKITQT_FOUND FALSE)
     message(STATUS "Cannot find Polkit-Qt library!")
     return()
-endif(_PQTLinkFlags)
+endif (POLKITQT_FOUND)
 
 
-# FIND_PATH( POLKITQT_INCLUDE_DIR PolicyKit/policykit-qt/Polkit-qt )
-FIND_PATH( POLKITQT_INCLUDE_DIR PolicyKit/polkit-qt/ )
+# find_path( POLKITQT_INCLUDE_DIR PolicyKit/policykit-qt/Polkit-qt )
+find_path( POLKITQT_INCLUDE_DIR PolicyKit/polkit-qt/ )
 
-FIND_LIBRARY( POLKITQT_CORE_LIBRARY NAMES polkit-qt-core )
-FIND_LIBRARY( POLKITQT_GUI_LIBRARY NAMES polkit-qt-gui )
+find_library( POLKITQT_CORE_LIBRARY NAMES polkit-qt-core )
+find_library( POLKITQT_GUI_LIBRARY NAMES polkit-qt-gui )
 
-IF (POLKITQT_INCLUDE_DIR AND POLKITQT_CORE_LIBRARY AND POLKITQT_GUI_LIBRARY)
-   SET(POLKITQT_FOUND TRUE)
-ELSE (POLKITQT_INCLUDE_DIR AND POLKITQT_CORE_LIBRARY AND POLKITQT_GUI_LIBRARY)
-   SET(POLKITQT_FOUND FALSE)
-ENDIF (POLKITQT_INCLUDE_DIR AND POLKITQT_CORE_LIBRARY AND POLKITQT_GUI_LIBRARY)
+if (POLKITQT_INCLUDE_DIR AND POLKITQT_CORE_LIBRARY AND POLKITQT_GUI_LIBRARY)
+   set(POLKITQT_FOUND TRUE)
+else (POLKITQT_INCLUDE_DIR AND POLKITQT_CORE_LIBRARY AND POLKITQT_GUI_LIBRARY)
+   set(POLKITQT_FOUND FALSE)
+endif (POLKITQT_INCLUDE_DIR AND POLKITQT_CORE_LIBRARY AND POLKITQT_GUI_LIBRARY)
 
-SET(POLKITQT_LIBRARIES ${POLKITQT_CORE_LIBRARY} ${POLKITQT_GUI_LIBRARY})
+set(POLKITQT_LIBRARIES ${POLKITQT_CORE_LIBRARY} ${POLKITQT_GUI_LIBRARY})
 
-SET(POLKITQT_INCLUDE_DIR ${POLKITQT_INCLUDE_DIR}/PolicyKit/polkit-qt \
${POLKITQT_INCLUDE_DIR}/PolicyKit/) +set(POLKITQT_INCLUDE_DIR \
${POLKITQT_INCLUDE_DIR}/PolicyKit/polkit-qt ${POLKITQT_INCLUDE_DIR}/PolicyKit/)  
-SET(POLICY_FILES_INSTALL_DIR share/PolicyKit/policy/)
+set(POLICY_FILES_INSTALL_DIR ${POLKITQT_PREFIX}/share/PolicyKit/policy/)
 
-IF (POLKITQT_FOUND)
-  IF (NOT POLKITQT_FIND_QUIETLY)
-    MESSAGE(STATUS "Found Polkit-qt: ${POLKITQT_LIBRARIES}")
-  ENDIF (NOT POLKITQT_FIND_QUIETLY)
-ELSE (POLKITQT_FOUND)
-  IF (POLKITQT_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could NOT find Polkit-qt")
-  ENDIF (POLKITQT_FIND_REQUIRED)
-ENDIF (POLKITQT_FOUND)
+if (POLKITQT_FOUND)
+  if (NOT POLKITQT_FIND_QUIETLY)
+    message(STATUS "Found Polkit-Qt: ${POLKITQT_LIBRARIES}")
+  endif (NOT POLKITQT_FIND_QUIETLY)
+else (POLKITQT_FOUND)
+  if (POLKITQT_FIND_REQUIRED)
+    message(FATAL_ERROR "Could NOT find Polkit-Qt")
+  endif (POLKITQT_FIND_REQUIRED)
+endif (POLKITQT_FOUND)
 
-MARK_AS_ADVANCED(POLKITQT_INCLUDE_DIR POLKITQT_LIB)
+mark_as_advanced(POLKITQT_INCLUDE_DIR POLKITQT_LIB)
 
-include (PkgConfigGetVar)
-
 macro(dbus_add_activation_system_service _sources)
-    #PKGCONFIG_GETVAR(dbus-1 session_bus_services_dir _install_dir)
+    pkg_search_module( DBUS dbus-1 )
     foreach (_i ${_sources})
         get_filename_component(_service_file ${_i} ABSOLUTE)
         string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})
         set(_target ${CMAKE_CURRENT_BINARY_DIR}/${_output_file})
         configure_file(${_service_file} ${_target})
-        install(FILES ${_target} DESTINATION \
                ${SHARE_INSTALL_PREFIX}/dbus-1/system-services )
-        #install(FILES ${_target} DESTINATION ${_install_dir})
+        install(FILES ${_target} DESTINATION \
${DBUS_PREFIX}/share/dbus-1/system-services )  endforeach (_i ${ARGN})
 endmacro(dbus_add_activation_system_service _sources)
-
--- trunk/extragear/multimedia/k3b/k3bsetup/worker/CMakeLists.txt #954543:954544
@@ -34,7 +34,7 @@
 )
 
 dbus_add_activation_system_service(org.k3b.setup.service.in)
-install(TARGETS k3bsetup_worker DESTINATION ${K3BSETUPWORKER_INSTALL_DIR} )
-install(FILES org.k3b.setup.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d)
-install(FILES org.k3b.setup.policy DESTINATION ${POLICY_FILES_INSTALL_DIR}) 
-install(FILES org.k3b.setup.xml DESTINATION ${KDE4_DBUS_INTERFACES_DIR} )
+install(TARGETS k3bsetup_worker DESTINATION ${K3BSETUPWORKER_INSTALL_DIR})
+install(FILES org.k3b.setup.conf DESTINATION \
${KDE4_SYSCONF_INSTALL_DIR}/dbus-1/system.d) +install(FILES org.k3b.setup.policy \
DESTINATION ${POLICY_FILES_INSTALL_DIR}) +install(FILES org.k3b.setup.xml DESTINATION \
${KDE4_DBUS_INTERFACES_DIR})


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