arts, kdelibs, kdebase, kdepim: use new tqt build system

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/arts@1226236 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
samelian 14 years ago
parent cba01693b4
commit 4448315e65

@ -37,19 +37,11 @@ option( WITH_MAD "Enable MAD mp3 decoder support" ON )
##### paths setup ############################### ##### paths setup ###############################
macro( _tde_internal_setup_path _path _default ) tde_setup_install_path( EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" )
if( DEFINED ${_path} ) tde_setup_install_path( BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" )
set( ${_path} "${${_path}}" CACHE INTERNAL "" FORCE ) tde_setup_install_path( LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
else( ) tde_setup_install_path( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/${CMAKE_PROJECT_NAME}" )
set( ${_path} "${_default}" ) tde_setup_install_path( PKGCONFIG_INSTALL_DIR "/usr/lib${LIB_SUFFIX}/pkgconfig" )
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" )
##### check for include files ################### ##### check for include files ###################
@ -167,11 +159,10 @@ else( GLIB2_FOUND )
endif( GLIB2_FOUND ) endif( GLIB2_FOUND )
##### check for Qt3 and TQt ##################### ##### check for TQt #############################
include( CheckCXXSourceCompiles ) include( CheckCXXSourceCompiles )
find_package( Qt )
find_package( TQt ) find_package( TQt )

@ -3,8 +3,8 @@ exec_prefix=@PC_EXEC_PREFIX@
libdir=@PC_LIB_DIR@ libdir=@PC_LIB_DIR@
includedir=@PC_INCLUDE_DIR@ includedir=@PC_INCLUDE_DIR@
Name: arts Name: aRts
Description: Soundserver for the K Desktop Environment (KDE) Description: Soundserver for the Trinity Desktop Environment (TDE)
Version: @ARTS_VERSION@ Version: @ARTS_VERSION@
Libs: -L${libdir} Libs: -L${libdir}
Cflags: -I${includedir} Cflags: -I${includedir}

@ -34,14 +34,11 @@ install( FILES
##### qtmcop ############################## ##### qtmcop ##############################
add_custom_command( set( qtmcop_SRCS qiomanager.cc )
OUTPUT qiomanager_p.moc tde_moc( qtmcop_SRCS qiomanager_p.h )
COMMAND ${TQT_TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qiomanager_p.h -o qiomanager_p.moc
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qiomanager_p.h
)
tde_add_library( qtmcop SHARED tde_add_library( qtmcop SHARED
SOURCES qiomanager.cc qiomanager_p.moc SOURCES ${qtmcop_SRCS}
VERSION 1.0.0 VERSION 1.0.0
LINK mcop-shared ${TQT_LIBRARIES} LINK mcop-shared ${TQT_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}

@ -40,6 +40,7 @@ namespace Arts {
class QIOWatch : public TQObject { class QIOWatch : public TQObject {
Q_OBJECT Q_OBJECT
TQ_OBJECT
protected: protected:
TQSocketNotifier *qsocketnotify; TQSocketNotifier *qsocketnotify;
int _fd; int _fd;
@ -61,6 +62,7 @@ public slots:
class QTimeWatch : public TQObject { class QTimeWatch : public TQObject {
Q_OBJECT Q_OBJECT
TQ_OBJECT
protected: protected:
TQTimer *timer; TQTimer *timer;
TimeNotify *_client; TimeNotify *_client;

Loading…
Cancel
Save