diff options
author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-10-06 15:27:35 +0000 |
---|---|---|
committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-10-06 15:27:35 +0000 |
commit | 4388c9f844be237080c30661997d5d56b2aecb5a (patch) | |
tree | 4a3f01ae3b8cebb7647bc7f050f8c4a2f57c633f /flow | |
parent | 435ac45427c2ab7517ed2d1deeed2be983679131 (diff) | |
download | arts-4388c9f844be237080c30661997d5d56b2aecb5a.tar.gz arts-4388c9f844be237080c30661997d5d56b2aecb5a.zip |
[dependencies/arts] restyle and migrate to tde_ macrossoundserver/CMakeLists.txt
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/arts@1183226 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'flow')
-rw-r--r-- | flow/CMakeLists.txt | 142 | ||||
-rw-r--r-- | flow/gsl/CMakeLists.txt | 91 | ||||
-rw-r--r-- | flow/gslpp/CMakeLists.txt | 12 | ||||
-rw-r--r-- | flow/mcopclass/CMakeLists.txt | 22 |
4 files changed, 108 insertions, 159 deletions
diff --git a/flow/CMakeLists.txt b/flow/CMakeLists.txt index 2f7325c..4231957 100644 --- a/flow/CMakeLists.txt +++ b/flow/CMakeLists.txt @@ -13,83 +13,55 @@ add_subdirectory( mcopclass ) add_subdirectory( gsl ) add_subdirectory( gslpp ) -set( artsflow_INCS - ${CMAKE_CURRENT_BINARY_DIR}/artsflow.h - audiosubsys.h - cache.h - cachedwav.h - convert.h - pipebuffer.h - stdsynthmodule.h - synthschedule.h - fft.h - artsflow.idl - audioio.h - resample.h - cpuinfo.h - bufferqueue.h - gslschedule.h +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/mcop + ${CMAKE_SOURCE_DIR}/mcop + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${GLIB2_INCLUDE_DIRS} ) -set( artsflow_SRCS - synth_play_impl.cc - gslschedule.cc - audiosubsys.cc - pipebuffer.cc - convert.cc - synth_wave_sin_impl.cc - synth_frequency_impl.cc - synth_multi_add_impl.cc - synth_add_impl.cc - synth_mul_impl.cc - synth_play_wav_impl.cc - stdsynthmodule.cc - cache.cc - asyncschedule.cc - bytestreamtoaudio_impl.cc - stereovolumecontrol_impl.cc - stereoeffectstack_impl.cc - fft.c - stereofftscope_impl.cc - virtualports.cc - bus.cc - audiomanager_impl.cc - synth_record_impl.cc - resample.cc - audioio.cc - audioiooss.cc - audioioalsa.cc - audioioalsa9.cc - audioionull.cc - audioiolibaudioio.cc - audioioesd.cc - audioiojack.cc - audioiosun.cc - audioioaix.cc - audioionas.cc - cpuinfo.cc - audioioossthreaded.cc - audiotobytestream_impl.cc - audioiosgi.cc - audioiocsl.cc - audioiomas.cc - datahandle_impl.cc -) -include_directories( - ${CMAKE_BINARY_DIR} # for config.h - ${CMAKE_BINARY_DIR}/mcop # for arts_export.h - ${CMAKE_SOURCE_DIR}/mcop # for common.h - ${CMAKE_CURRENT_BINARY_DIR} # for gsl/gslconfig.h - ${CMAKE_CURRENT_SOURCE_DIR} # for gsl/gsldefs.h - ${GLIB2_INCLUDE_DIRS} # for glib.h +##### headers ################################### + +install( FILES + audiosubsys.h cache.h cachedwav.h convert.h + pipebuffer.h stdsynthmodule.h synthschedule.h + fft.h artsflow.idl audioio.h resample.h cpuinfo.h + bufferqueue.h gslschedule.h + ${CMAKE_CURRENT_BINARY_DIR}/artsflow.h + DESTINATION ${INCLUDE_INSTALL_DIR} ) + + +##### artsflow (shared lib) ##################### + +set( target artsflow ) + +set( ${target}_SRCS + synth_play_impl.cc gslschedule.cc audiosubsys.cc + pipebuffer.cc convert.cc synth_wave_sin_impl.cc + synth_frequency_impl.cc synth_multi_add_impl.cc + synth_add_impl.cc synth_mul_impl.cc synth_play_wav_impl.cc + stdsynthmodule.cc cache.cc asyncschedule.cc bytestreamtoaudio_impl.cc + stereovolumecontrol_impl.cc stereoeffectstack_impl.cc + fft.c stereofftscope_impl.cc virtualports.cc bus.cc + audiomanager_impl.cc synth_record_impl.cc resample.cc + audioio.cc audioiooss.cc audioioalsa.cc audioioalsa9.cc + audioionull.cc audioiolibaudioio.cc audioioesd.cc + audioiojack.cc audioiosun.cc audioioaix.cc audioionas.cc + cpuinfo.cc audioioossthreaded.cc audiotobytestream_impl.cc + audioiosgi.cc audioiocsl.cc audioiomas.cc datahandle_impl.cc ) -add_definitions( - -DHAVE_CONFIG_H +tde_add_library( ${target} SHARED + SOURCES ${${target}_SRCS} + VERSION 1.0.0 + LINK gsl-static gslpp-static artsflow_idl-shared ${AUDIOFILE_LIBRARIES} + DESTINATION ${LIB_INSTALL_DIR} ) -##### artsflow_idl +##### artsflow_idl (shared lib) ################# add_custom_command( OUTPUT artsflow.cc @@ -97,28 +69,10 @@ add_custom_command( ARGS -t ${CMAKE_CURRENT_SOURCE_DIR}/artsflow.idl DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/artsflow.idl ) -set( artsflow_idl_SRCS artsflow.cc ) -add_library( artsflow_idl SHARED ${artsflow_idl_SRCS} ) -set_target_properties( artsflow_idl PROPERTIES VERSION 1.0 SOVERSION 1 ) -target_link_libraries( artsflow_idl mcop ${ALSA_LIBRARY} ) -add_dependencies( artsflow_idl mcopidl ) - -##### artsflow - -add_library( artsflow SHARED ${artsflow_SRCS} ) -set_target_properties( artsflow PROPERTIES VERSION 1.0 SOVERSION 1 ) - -target_link_libraries( artsflow - artsflow_idl - mcop - gslpp - gsl - ${AUDIOFILE_LIBRARIES} +tde_add_library( artsflow_idl SHARED + SOURCES artsflow.cc + VERSION 1.0.0 + LINK mcop-shared ${ALSA_LIBRARY} + DESTINATION ${LIB_INSTALL_DIR} + DEPENDENCIES mcopidl ) - - - -##### install ################################### - -install( FILES ${artsflow_INCS} DESTINATION ${INCLUDE_INSTALL_DIR} ) -install( TARGETS artsflow_idl artsflow LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
\ No newline at end of file diff --git a/flow/gsl/CMakeLists.txt b/flow/gsl/CMakeLists.txt index 7c880ee..952311b 100644 --- a/flow/gsl/CMakeLists.txt +++ b/flow/gsl/CMakeLists.txt @@ -103,61 +103,7 @@ set( GSL_USE_ARTS_THREADS 1 ) configure_file( gslconfig.h.in gslconfig.h @ONLY ) -##### compile ################################### - -set( gsl_INCS - ${CMAKE_CURRENT_BINARY_DIR}/gslconfig.h - gslcommon.h - gsldatacache.h - gsldatahandle.h - gsldefs.h - gslloader.h - gslmath.h - gslfilter.h - gsldatautils.h - gsldatahandle-vorbis.h - gslconvert.h - gslfft.h - gslieee754.h - gslsignal.h - gslmagic.h - gslengine.h - gslwaveosc.h - gslwavechunk.h - gsldatahandle-mad.h - gslosctable.h - gsloscillator.h -) - -set( gsl_SRCS - gsldatacache.c - gsldatahandle.c - gslwavechunk.c - gsldatahandle-vorbis.c - gslmath.c - gslfilter.c - gslcommon.c - gsldatautils.c - gslmagic.c - gslloader-wav.c - gslloader-gslwave.c - gslloader-mad.c - gslloader-oggvorbis.c - gslconvert.c - gslfft.c - gslsignal.c - gslloader.c - gslwaveosc.c - gslengine.c - gsloputil.c - gslopmaster.c - gslopschedule.c - gsldatahandle-mad.c - gslosctable.c - gsloscillator.c - gslfilehash.c - gslartsthreads.cc -) +##### include paths ############################# include_directories( ${CMAKE_BINARY_DIR} @@ -168,12 +114,37 @@ include_directories( ${GLIB2_INCLUDE_DIRS} ) -add_library( gsl STATIC ${gsl_SRCS} ) -set_target_properties( gsl PROPERTIES COMPILE_FLAGS -fPIC ) -target_link_libraries( gsl ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${VORBISFILE_LIBRARIES} ${MAD_LIBRARIES} ) + +##### headers ################################### + +install( FILES + gslcommon.h gsldatacache.h gsldatahandle.h + gsldefs.h gslloader.h gslmath.h gslfilter.h + gsldatautils.h gsldatahandle-vorbis.h gslconvert.h + gslfft.h gslieee754.h gslsignal.h gslmagic.h + gslengine.h gslwaveosc.h gslwavechunk.h + gsldatahandle-mad.h gslosctable.h gsloscillator.h + ${CMAKE_CURRENT_BINARY_DIR}/gslconfig.h + DESTINATION ${INCLUDE_INSTALL_DIR}/gsl ) -##### install ################################### +##### gsl (static lib) ########################## -install( FILES ${gsl_INCS} DESTINATION ${INCLUDE_INSTALL_DIR}/gsl ) +set( target gsl ) + +set( ${target}_SRCS + gsldatacache.c gsldatahandle.c gslwavechunk.c + gsldatahandle-vorbis.c gslmath.c gslfilter.c + gslcommon.c gsldatautils.c gslmagic.c gslloader-wav.c + gslloader-gslwave.c gslloader-mad.c gslloader-oggvorbis.c + gslconvert.c gslfft.c gslsignal.c gslloader.c + gslwaveosc.c gslengine.c gsloputil.c gslopmaster.c + gslopschedule.c gsldatahandle-mad.c gslosctable.c + gsloscillator.c gslfilehash.c gslartsthreads.cc +) + +tde_add_library( ${target} STATIC_PIC + SOURCES ${${target}_SRCS} + LINK ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${VORBISFILE_LIBRARIES} ${MAD_LIBRARIES} +) diff --git a/flow/gslpp/CMakeLists.txt b/flow/gslpp/CMakeLists.txt index bf145a6..cd8576c 100644 --- a/flow/gslpp/CMakeLists.txt +++ b/flow/gslpp/CMakeLists.txt @@ -16,9 +16,11 @@ include_directories( ${GLIB2_INCLUDE_DIRS} ) -set( gslpp_SRCS - datahandle.cpp -) -add_library( gslpp STATIC ${gslpp_SRCS} ) -set_target_properties( gslpp PROPERTIES COMPILE_FLAGS -fPIC)
\ No newline at end of file +##### gslpp (static lib) ######################## + +set( target gslpp ) + +tde_add_library( ${target} STATIC_PIC + SOURCES datahandle.cpp +) diff --git a/flow/mcopclass/CMakeLists.txt b/flow/mcopclass/CMakeLists.txt index e69de29..913584c 100644 --- a/flow/mcopclass/CMakeLists.txt +++ b/flow/mcopclass/CMakeLists.txt @@ -0,0 +1,22 @@ +################################################# +# +# (C) 2010 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +##### other data ################################ + +install( FILES + Synth_ADD.mcopclass Synth_FREQUENCY.mcopclass + Synth_MUL.mcopclass Synth_MULTI_ADD.mcopclass + Synth_PLAY.mcopclass Synth_RECORD.mcopclass + Synth_PLAY_WAV.mcopclass Synth_WAVE_SIN.mcopclass + Synth_BUS_DOWNLINK.mcopclass Synth_BUS_UPLINK.mcopclass + Synth_AMAN_PLAY.mcopclass Synth_AMAN_RECORD.mcopclass + DataHandlePlay.mcopclass WaveDataHandle.mcopclass + DESTINATION ${LIB_INSTALL_DIR}/mcop/Arts ) |