kdesupport/polkit-qt-1

[Maciej Mrozowski]

SVN commit 1103057 by mmrozowski:

Fix linking with polkit-1. Also keep <module>_LIBRARIES naming scheme instead of <module>_LIBRARY.

CCMAIL: kde-buildsystem at kde.org

 M  +4 -4      agent/CMakeLists.txt  
 M  +4 -4      cmake/modules/FindPolkit.cmake  
 M  +2 -2      core/CMakeLists.txt  
 M  +2 -2      gui/CMakeLists.txt  


--- trunk/kdesupport/polkit-qt-1/agent/CMakeLists.txt #1103056:1103057
@@ -12,9 +12,9 @@
 automoc4_add_library(polkit-qt-agent-1 SHARED ${polkit_qt_agent_SRCS})
 
 target_link_libraries(polkit-qt-agent-1
-  ${POLKIT-1_LIBRARIES}
+  ${POLKIT_LIBRARIES}
   ${QT_QTCORE_LIBRARY}
-  ${POLKIT-1_AGENT_LIBRARIES}
+  ${POLKIT_AGENT_LIBRARY}
   polkit-qt-core-1
 )
 
@@ -22,5 +22,5 @@
                                 SOVERSION ${CMAKE_MAJOR_POLKITQT-1_VERSION}
                                 DEFINE_SYMBOL MAKE_POLKITQT1_LIB
                       )
-  
-install(TARGETS polkit-qt-agent-1 ${INSTALL_TARGETS_DEFAULT_ARGS}) 
+
+install(TARGETS polkit-qt-agent-1 ${INSTALL_TARGETS_DEFAULT_ARGS})
--- trunk/kdesupport/polkit-qt-1/cmake/modules/FindPolkit.cmake #1103056:1103057
@@ -4,7 +4,7 @@
 #  POLKIT_FOUND - system has Polkit
 #  POLKIT_INCLUDE_DIRS - Polkit's include directories
 #  POLKIT_AGENT_INCLUDE_DIRS - Polkit-agent's include directories
-#  POLKIT_LIBRARY - Link this to use polkit's gobject library
+#  POLKIT_LIBRARIES - Link this to use polkit's gobject library
 #  POLKIT_AGENT_LIBRARY - Link this to use the agent wrapper in polkit
 #  POLKIT_DEFINITIONS - Compiler switches required for using Polkit
 
@@ -50,7 +50,7 @@
 set(POLKIT_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS} ${_POLKIT_INCLUDE_DIR})
 set(POLKIT_AGENT_INCLUDE_DIRS ${GLIB2_INCLUDE_DIRS} ${_POLKIT_AGENT_INCLUDE_DIR})
 
-find_library( POLKIT_LIBRARY
+find_library( POLKIT_LIBRARIES
     NAMES polkit-gobject-1
     HINTS ${PC_POLKIT_LIBDIR}
 )
@@ -64,9 +64,9 @@
 
 # handle the QUIETLY and REQUIRED arguments and set POLKIT_FOUND to TRUE if
 # all listed variables are TRUE
-find_package_handle_standard_args(Polkit DEFAULT_MSG POLKIT_LIBRARY POLKIT_AGENT_LIBRARY
+find_package_handle_standard_args(Polkit DEFAULT_MSG POLKIT_LIBRARIES POLKIT_AGENT_LIBRARY
                                                      _POLKIT_INCLUDE_DIR _POLKIT_AGENT_INCLUDE_DIR GLIB2_FOUND)
 
-mark_as_advanced(POLKIT_INCLUDE_DIRS POLKIT_AGENT_INCLUDE_DIRS POLKIT_LIBRARY POLKIT_AGENT_LIBRARY GLIB_INCLUDE_DIR)
+mark_as_advanced(POLKIT_INCLUDE_DIRS POLKIT_AGENT_INCLUDE_DIRS POLKIT_LIBRARIES POLKIT_AGENT_LIBRARY GLIB_INCLUDE_DIR)
 
 set(POLKIT_POLICY_FILES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions)
--- trunk/kdesupport/polkit-qt-1/core/CMakeLists.txt #1103056:1103057
@@ -18,12 +18,12 @@
 	${QT_QTCORE_LIBRARY}
 	${QT_QTDBUS_LIBRARY}
 	${QT_QTXML_LIBRARY}
-	${POLKIT-1_LIBRARIES}
+	${POLKIT_LIBRARIES}
 )
 
 set_target_properties(polkit-qt-core-1 PROPERTIES VERSION ${CMAKE_POLKITQT-1_VERSION_STRING}
                                 SOVERSION ${CMAKE_MAJOR_POLKITQT-1_VERSION}
                                 DEFINE_SYMBOL MAKE_POLKITQT1_LIB
                       )
-  
+
 install(TARGETS polkit-qt-core-1 ${INSTALL_TARGETS_DEFAULT_ARGS})
--- trunk/kdesupport/polkit-qt-1/gui/CMakeLists.txt #1103056:1103057
@@ -16,9 +16,9 @@
 	${QT_QTCORE_LIBRARY}
 	${QT_QTGUI_LIBRARY}
 	${QT_QTDBUS_LIBRARY}
-	${POLKIT-1_LIBRARIES}
+	${POLKIT_LIBRARIES}
 )
-                      
+
 set_target_properties(polkit-qt-gui-1 PROPERTIES VERSION ${CMAKE_POLKITQT-1_VERSION_STRING}
                                 SOVERSION ${CMAKE_MAJOR_POLKITQT-1_VERSION}
                                 DEFINE_SYMBOL MAKE_POLKITQT1_LIB