Browse Source

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
tags/v3.5.13
samelian 9 years ago
parent
commit
4448315e65
4 changed files with 13 additions and 23 deletions
  1. +6
    -15
      CMakeLists.txt
  2. +2
    -2
      arts.pc.cmake
  3. +3
    -6
      qtmcop/CMakeLists.txt
  4. +2
    -0
      qtmcop/qiomanager_p.h

+ 6
- 15
CMakeLists.txt View File

@@ -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 )




+ 2
- 2
arts.pc.cmake View File

@@ -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}

+ 3
- 6
qtmcop/CMakeLists.txt View File

@@ -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}


+ 2
- 0
qtmcop/qiomanager_p.h View File

@@ -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;


Loading…
Cancel
Save