diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ConfigureChecks.cmake | 6 | ||||
| -rw-r--r-- | kioslave/media/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kioslave/media/propsdlgplugin/CMakeLists.txt | 35 |
4 files changed, 40 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 939814f1e..7b8a02b99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,6 +59,7 @@ option( WITH_SHADOW "kdm should use shadow passwords" OFF ) option( WITH_XINERAMA "Enable xinerama extension support" OFF ) option( WITH_ARTS "Enable aRts support" OFF ) option( WITH_I8K "Enable Dell laptop support (ksysguard)" OFF ) +option( WITH_HAL "Enable HAL support" OFF ) ##### user requested modules #################### diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 21126547e..5263aabad 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -35,11 +35,11 @@ if( WITH_PAM AND (BUILD_KCHECKPASS OR BUILD_KDM) ) endif( ) -# hal (ksmserver ) -if( BUILD_KSMSERVER ) +# hal (ksmserver, kioslaves) +if( BUILD_KSMSERVER OR (WITH_HAL AND BUILD_KIOSLAVES)) pkg_search_module( HAL hal ) if( NOT HAL_FOUND ) - tde_message_fatal( "hal are required, but not found on your system" ) + tde_message_fatal( "hal is required, but was not found on your system" ) endif( ) endif( ) diff --git a/kioslave/media/CMakeLists.txt b/kioslave/media/CMakeLists.txt index bce9c7a3c..e140b1488 100644 --- a/kioslave/media/CMakeLists.txt +++ b/kioslave/media/CMakeLists.txt @@ -9,8 +9,6 @@ # ################################################# -# FIXME no HAL support yet - add_subdirectory( libmediacommon ) add_subdirectory( mediamanager ) add_subdirectory( medianotifier ) @@ -19,7 +17,7 @@ add_subdirectory( kfile-plugin ) add_subdirectory( kcmodule ) add_subdirectory( mimetypes ) add_subdirectory( services ) -# tde_conditional_add_subdirectory( WITH_HAL propsdlgplugin ) +tde_conditional_add_subdirectory( WITH_HAL propsdlgplugin ) include_directories( diff --git a/kioslave/media/propsdlgplugin/CMakeLists.txt b/kioslave/media/propsdlgplugin/CMakeLists.txt new file mode 100644 index 000000000..17189ec46 --- /dev/null +++ b/kioslave/media/propsdlgplugin/CMakeLists.txt @@ -0,0 +1,35 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +install( FILES media_propsdlgplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) + + +##### media_propsdlgplugin (module) ############# + +tde_add_kpart( media_propsdlgplugin AUTOMOC + SOURCES + propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp + LINK mediacommon-static kio-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) |