diff --git a/CMakeLists.txt b/CMakeLists.txt index c4609394d..edf5372dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,6 +112,11 @@ option( BUILD_KSYSGUARD "Build ksysguard" ${BUILD_ALL} ) option( BUILD_KXKB "Build kxkb" ${BUILD_ALL} ) +##### set PKG_CONFIG_PATH ####################### + +set( ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:$ENV{PKG_CONFIG_PATH}:${LIB_INSTALL_DIR}/pkgconfig" ) + + ##### configure checks ########################## include( ConfigureChecks.cmake ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 5263aabad..f237d77dd 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -132,6 +132,17 @@ if( BUILD_KDM OR BUILD_KXKB ) endif( ) +# arts +if( WITH_ARTS ) + pkg_search_module( ARTS arts ) + if( NOT ARTS_FOUND ) + message( FATAL_ERROR "\naRts is requested, but was not found on your system" ) + endif( ) +else( ) + set( WITHOUT_ARTS 1 ) +endif( ) + + # required stuff find_package( Qt ) find_package( TQt ) diff --git a/libkonq/CMakeLists.txt b/libkonq/CMakeLists.txt index 4dbac40c8..b96a8caa0 100644 --- a/libkonq/CMakeLists.txt +++ b/libkonq/CMakeLists.txt @@ -15,19 +15,17 @@ project( libkonq ) add_subdirectory( pics ) add_subdirectory( favicons ) -add_definitions( - -include tqt.h -) - include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} + ${ARTS_INCLUDE_DIRS} ) link_directories( ${TQT_LIBRARY_DIRS} + ${ARTS_LIBRARY_DIRS} ) @@ -52,27 +50,30 @@ install( FILES konqpopupmenuplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DI ##### konq (shared lib) ######################### -set( target konq ) - -set( ${target}_SRCS - konq_popupmenu.cc knewmenu.cc konq_xmlguiclient.cc - kfileivi.cc konq_iconviewwidget.cc konq_settings.cc - konq_drag.cc konq_operations.cc konq_dirpart.cc - konq_propsview.cc konq_events.cc konq_bgnddlg.cc - konq_undo.cc konq_undo.skel konq_historymgr.cc - konq_historycomm.cc konq_historycomm.skel konq_pixmapprovider.cc - kivdirectoryoverlay.cc konq_faviconmgr.cc konq_faviconmgr.skel - konq_filetip.cc -) - -tde_add_library( ${target} SHARED AUTOMOC - SOURCES ${${target}_SRCS} +tde_add_library( konq SHARED AUTOMOC + SOURCES + konq_popupmenu.cc knewmenu.cc konq_xmlguiclient.cc kfileivi.cc + konq_iconviewwidget.cc konq_settings.cc konq_drag.cc konq_operations.cc + konq_dirpart.cc konq_propsview.cc konq_events.cc konq_bgnddlg.cc konq_undo.cc + konq_undo.skel konq_historymgr.cc konq_historycomm.cc konq_historycomm.skel + konq_pixmapprovider.cc kivdirectoryoverlay.cc konq_faviconmgr.cc + konq_faviconmgr.skel konq_filetip.cc VERSION 4.2.0 LINK kparts-shared DESTINATION ${LIB_INSTALL_DIR} ) +##### konq_sound (module) ####################### + +if( WITH_ARTS ) + tde_add_kpart( konq_sound + SOURCES konq_sound.cc + LINK artskde-shared + DESTINATION ${PLUGIN_INSTALL_DIR} ) +endif( ) + + ##### install import cmake modules ############### tde_install_export( ) diff --git a/libkonq/favicons/CMakeLists.txt b/libkonq/favicons/CMakeLists.txt index fd3058fb3..627f99ec2 100644 --- a/libkonq/favicons/CMakeLists.txt +++ b/libkonq/favicons/CMakeLists.txt @@ -9,14 +9,8 @@ # ################################################# -add_definitions( -) - include_directories( ${CMAKE_CURRENT_BINARY_DIR} - #${CMAKE_CURRENT_SOURCE_DIR} - #${CMAKE_BINARY_DIR} - #${CMAKE_SOURCE_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -36,14 +30,8 @@ install( PROGRAMS move_favicons.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) ##### kded_favicons (module) #################### -set( target kded_favicons ) - -set( ${target}_SRCS - favicons.cpp favicons.skel -) - -tde_add_kpart( ${target} AUTOMOC - SOURCES ${${target}_SRCS} +tde_add_kpart( kded_favicons AUTOMOC + SOURCES favicons.cpp favicons.skel LINK kdeinit_kded-shared - DESTINATION ${TDE_MODULEDIR} + DESTINATION ${PLUGIN_INSTALL_DIR} )