From d1dc3998e9db7a0284f06bf8186a00a292fea13d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 23 Jan 2021 02:24:29 +0100 Subject: cmake: Simplify 'skel' and 'stub' generation for kspeech and kspeechlink as well as their subsequent linking. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 91fc9555abdfd455096b61b350d57ec79943b220) --- kttsd/kttsd/CMakeLists.txt | 68 ++-------------------------------------------- 1 file changed, 2 insertions(+), 66 deletions(-) (limited to 'kttsd/kttsd') diff --git a/kttsd/kttsd/CMakeLists.txt b/kttsd/kttsd/CMakeLists.txt index 78657f0..76695bf 100644 --- a/kttsd/kttsd/CMakeLists.txt +++ b/kttsd/kttsd/CMakeLists.txt @@ -13,73 +13,13 @@ link_directories( ${TDE_LIB_DIR} ) -##### kttsd_kspeech - -set( KSPEECH_KIDL kspeech.kidl ) -set( KSPEECH_SKEL kspeech_skel ) - -add_custom_command( - OUTPUT ${KSPEECH_KIDL} - COMMAND ${KDE3_DCOPIDL_EXECUTABLE} ${KTTS_KSPEECH_DIR}/kspeech.h > ${KSPEECH_KIDL} - DEPENDS ${KTTS_KSPEECH_DIR}/kspeech.h -) -add_custom_target( kttsd-kspeech-kidl DEPENDS ${KSPEECH_KIDL} ) - -add_custom_command( - OUTPUT ${KSPEECH_SKEL}.cpp - COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} --c++-suffix cpp --no-signals --no-stub ${KSPEECH_KIDL} - DEPENDS kttsd-kspeech-kidl -) -add_custom_target( kttsd-kspeech-skel DEPENDS ${KSPEECH_SKEL}.cpp ) - - -###### kttsd_kspeechsink - -set( KSPEECHSINK_KIDL kspeechsink.kidl ) -set( KSPEECHSINK_STUB kspeechsink_stub ) - -add_custom_command( - OUTPUT ${KSPEECHSINK_KIDL} - COMMAND ${KDE3_DCOPIDL_EXECUTABLE} ${KTTS_KSPEECH_DIR}/kspeechsink.h > ${KSPEECHSINK_KIDL} - DEPENDS ${KTTS_KSPEECH_DIR}/kspeechsink.h -) -add_custom_target( kttsd-kspeechsink-kidl DEPENDS ${KSPEECHSINK_KIDL} ) - -add_custom_command( - OUTPUT ${KSPEECHSINK_STUB}.h - COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} --c++-suffix cpp --no-signals --no-skel ${KSPEECHSINK_KIDL} - DEPENDS kttsd-kspeechsink-kidl -) -add_custom_target( kttsd-kspeechsink-stub DEPENDS ${KSPEECHSINK_STUB}.h ) - - -##### kttsd - -set( KTTSD_KIDL kttsd.kidl ) -set( KTTSD_SKEL kttsd_skel ) - -add_custom_command( - OUTPUT ${KTTSD_KIDL} - COMMAND ${KDE3_DCOPIDL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/kttsd/kttsd/kttsd.h > ${KTTSD_KIDL} - DEPENDS ${CMAKE_SOURCE_DIR}/kttsd/kttsd/kttsd.h -) -add_custom_target( kttsd-kidl DEPENDS ${KTTSD_KIDL} ) - -add_custom_command( - OUTPUT ${KTTSD_SKEL}.cpp - COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} --c++-suffix cpp --no-signals --no-stub ${KTTSD_KIDL} - DEPENDS kttsd-kidl -) -add_custom_target( kttsd-skel DEPENDS ${KTTSD_SKEL}.cpp ) - ##### kttsd (executable) tde_add_executable( kttsd AUTOMOC SOURCES - ${CMAKE_CURRENT_BINARY_DIR}/${KSPEECH_SKEL}.cpp - ${CMAKE_CURRENT_BINARY_DIR}/${KTTSD_SKEL}.cpp + kttsd.skel main.cpp kttsd.cpp speaker.cpp @@ -93,11 +33,7 @@ tde_add_executable( kttsd AUTOMOC tdeui-shared tdeio-shared kttsd-shared - - DEPENDENCIES - kttsd-kspeech-skel - kttsd-kspeechsink-stub - kttsd-skel + kspeech_skel-static DESTINATION ${BIN_INSTALL_DIR} ) -- cgit v1.2.3