diff options
| -rw-r--r-- | CMakeLists.txt | 21 | ||||
| -rw-r--r-- | arts.pc.cmake | 4 | ||||
| -rw-r--r-- | qtmcop/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | qtmcop/qiomanager_p.h | 2 |
4 files changed, 13 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f187b65..b442d86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,19 +37,11 @@ option( WITH_MAD "Enable MAD mp3 decoder support" ON ) ##### paths setup ############################### -macro( _tde_internal_setup_path _path _default ) - if( DEFINED ${_path} ) - set( ${_path} "${${_path}}" CACHE INTERNAL "" FORCE ) - else( ) - set( ${_path} "${_default}" ) - endif( ) -endmacro( _tde_internal_setup_path ) - -_tde_internal_setup_path( EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" ) -_tde_internal_setup_path( BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" ) -_tde_internal_setup_path( LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" ) -_tde_internal_setup_path( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/${CMAKE_PROJECT_NAME}" ) -_tde_internal_setup_path( PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" ) +tde_setup_install_path( EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" ) +tde_setup_install_path( BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" ) +tde_setup_install_path( LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" ) +tde_setup_install_path( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/${CMAKE_PROJECT_NAME}" ) +tde_setup_install_path( PKGCONFIG_INSTALL_DIR "/usr/lib${LIB_SUFFIX}/pkgconfig" ) ##### check for include files ################### @@ -167,11 +159,10 @@ else( GLIB2_FOUND ) endif( GLIB2_FOUND ) -##### check for Qt3 and TQt ##################### +##### check for TQt ############################# include( CheckCXXSourceCompiles ) -find_package( Qt ) find_package( TQt ) diff --git a/arts.pc.cmake b/arts.pc.cmake index 17f8aff..2c26a41 100644 --- a/arts.pc.cmake +++ b/arts.pc.cmake @@ -3,8 +3,8 @@ exec_prefix=@PC_EXEC_PREFIX@ libdir=@PC_LIB_DIR@ includedir=@PC_INCLUDE_DIR@ -Name: arts -Description: Soundserver for the K Desktop Environment (KDE) +Name: aRts +Description: Soundserver for the Trinity Desktop Environment (TDE) Version: @ARTS_VERSION@ Libs: -L${libdir} Cflags: -I${includedir} diff --git a/qtmcop/CMakeLists.txt b/qtmcop/CMakeLists.txt index f2733c4..a4ff199 100644 --- a/qtmcop/CMakeLists.txt +++ b/qtmcop/CMakeLists.txt @@ -34,14 +34,11 @@ install( FILES ##### qtmcop ############################## -add_custom_command( - OUTPUT qiomanager_p.moc - COMMAND ${TQT_TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qiomanager_p.h -o qiomanager_p.moc - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qiomanager_p.h -) +set( qtmcop_SRCS qiomanager.cc ) +tde_moc( qtmcop_SRCS qiomanager_p.h ) tde_add_library( qtmcop SHARED - SOURCES qiomanager.cc qiomanager_p.moc + SOURCES ${qtmcop_SRCS} VERSION 1.0.0 LINK mcop-shared ${TQT_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} diff --git a/qtmcop/qiomanager_p.h b/qtmcop/qiomanager_p.h index b4fea29..5c5e8e5 100644 --- a/qtmcop/qiomanager_p.h +++ b/qtmcop/qiomanager_p.h @@ -40,6 +40,7 @@ namespace Arts { class QIOWatch : public TQObject { Q_OBJECT + TQ_OBJECT protected: TQSocketNotifier *qsocketnotify; int _fd; @@ -61,6 +62,7 @@ public slots: class QTimeWatch : public TQObject { Q_OBJECT + TQ_OBJECT protected: TQTimer *timer; TimeNotify *_client; |