diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index a2d6593a..149c0dcf 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -35,18 +35,19 @@ if( BUILD_DOC AND BUILD_KIG ) endif( ) -##### check for arts - -if( WITH_ARTS ) - pkg_search_module( ARTS arts ) - if( NOT ARTS_FOUND ) - tde_message_fatal( "aRts is requested but was not found on your system" ) - endif( NOT ARTS_FOUND ) - set( WITHOUT_ARTS false ) -endif( WITH_ARTS ) +##### check for arts support if( NOT WITH_ARTS ) - set( WITHOUT_ARTS 1 ) + set( WITHOUT_ARTS 1 ) + else() + find_library( ARTSKDE_LIBRARIES artskde ) + if( NOT ARTSKDE_LIBRARIES ) + tde_message_fatal( "aRts support through tdelibs is requested, but was not found on your system" ) + else() + find_path( ARTSKDE_INCLUDE_DIRS kartsdispatcher.h + PATH_SUFFIXES arts + ) + endif() endif( NOT WITH_ARTS ) diff --git a/blinken/src/CMakeLists.txt b/blinken/src/CMakeLists.txt index b0d1e1f4..1312e8db 100644 --- a/blinken/src/CMakeLists.txt +++ b/blinken/src/CMakeLists.txt @@ -4,6 +4,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} + ${ARTSKDE_INCLUDE_DIRS} ) link_directories( @@ -32,7 +33,7 @@ tde_add_executable( blinken AUTOMOC tdecore-shared tdeui-shared tdeio-shared - artskde-shared + ${ARTSKDE_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/blinken/src/artsplayer.h b/blinken/src/artsplayer.h index 9fa7ece7..5af91f8e 100644 --- a/blinken/src/artsplayer.h +++ b/blinken/src/artsplayer.h @@ -22,10 +22,10 @@ namespace KDE class PlayObject; } #else -#include -#include -#include -#include +#include +#include +#include +#include #endif #include diff --git a/kanagram/src/CMakeLists.txt b/kanagram/src/CMakeLists.txt index 7686af03..c3293830 100644 --- a/kanagram/src/CMakeLists.txt +++ b/kanagram/src/CMakeLists.txt @@ -4,6 +4,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} + ${ARTSKDE_INCLUDE_DIRS} ) link_directories( @@ -44,7 +45,7 @@ tde_add_executable( kanagram AUTOMOC tdeui-shared tdeio-shared tdenewstuff-shared - artskde-shared + ${ARTSKDE_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kanagram/src/kanagram.h b/kanagram/src/kanagram.h index 2587e62f..876cc53f 100644 --- a/kanagram/src/kanagram.h +++ b/kanagram/src/kanagram.h @@ -29,10 +29,10 @@ #include #ifndef WITHOUT_ARTS -#include -#include -#include -#include +#include +#include +#include +#include #else class KArtsDispatcher; class KArtsServer;