summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ksayit/KTTSD_Lib/CMakeLists.txt2
-rw-r--r--kspeechsink/CMakeLists.txt56
-rw-r--r--kttsd/kcmkttsmgr/CMakeLists.txt2
-rw-r--r--kttsd/kttsd/CMakeLists.txt68
-rw-r--r--kttsd/kttsjobmgr/CMakeLists.txt2
-rw-r--r--kttsd/kttsmgr/CMakeLists.txt2
6 files changed, 17 insertions, 115 deletions
diff --git a/ksayit/KTTSD_Lib/CMakeLists.txt b/ksayit/KTTSD_Lib/CMakeLists.txt
index 6f3f318..511c22d 100644
--- a/ksayit/KTTSD_Lib/CMakeLists.txt
+++ b/ksayit/KTTSD_Lib/CMakeLists.txt
@@ -26,7 +26,7 @@ tde_add_library( KTTSD_Lib SHARED AUTOMOC
LINK
tdeui-shared
tdecore-shared
- DUMMY_kspeech_lib-static
+ kspeech_stub-static
VERSION 0.0.1
diff --git a/kspeechsink/CMakeLists.txt b/kspeechsink/CMakeLists.txt
index 0b3560a..26e4dd3 100644
--- a/kspeechsink/CMakeLists.txt
+++ b/kspeechsink/CMakeLists.txt
@@ -12,60 +12,26 @@ link_directories(
${TDE_LIB_DIR}
)
-add_compile_options( -fPIC )
+##### kspeech_stub (static)
-##### ksayit_kspeech
+tde_add_library( kspeech_stub STATIC_PIC
-set( KSPEECH_KIDL kspeech.kidl )
-set( KSPEECH_STUB kspeech_stub )
-
-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( ksayit-kspeech-kidl DEPENDS ${KSPEECH_KIDL} )
-
-add_custom_command(
- OUTPUT ${KSPEECH_STUB}.h ${KSPEECH_STUB}.cpp
- COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} --c++-suffix cpp --no-signals --no-skel ${KSPEECH_KIDL}
- DEPENDS ${KSPEECH_KIDL}
-)
-add_custom_target( ksayit-kspeech-stub DEPENDS ${KSPEECH_STUB}.cpp )
-
-
-###### ksayit_kspeechsink
-
-set( KSPEECHSINK_KIDL kspeechsink.kidl )
-set( KSPEECHSINK_SKEL kspeechsink_skel )
-
-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( ksayit-kspeechsink-kidl DEPENDS ${KSPEECHSINK_KIDL} )
+ SOURCES
+ ${KTTS_KSPEECH_DIR}/kspeech.stub
+ ${KTTS_KSPEECH_DIR}/kspeechsink.skel
-add_custom_command(
- OUTPUT ${KSPEECHSINK_SKEL}.cpp
- COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} --c++-suffix cpp --no-signals --no-stub ${KSPEECHSINK_KIDL}
- DEPENDS ${KSPEECHSINK_KIDL}
+ EXCLUDE_FROM_ALL
)
-add_custom_target( ksayit-kspeechsink-skel DEPENDS ${KSPEECHSINK_SKEL}.cpp )
-##### DUMMY_Lib (static)
+##### kspeech_skel (static)
-tde_add_library( DUMMY_kspeech_lib STATIC
+tde_add_library( kspeech_skel STATIC_PIC
SOURCES
- ${CMAKE_CURRENT_BINARY_DIR}/${KSPEECH_STUB}.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/${KSPEECHSINK_SKEL}.cpp
- LINK
- tdecore-shared
+ ${KTTS_KSPEECH_DIR}/kspeech.skel
+ ${KTTS_KSPEECH_DIR}/kspeechsink.stub
- DEPENDENCIES
- ksayit-kspeech-stub
- ksayit-kspeechsink-skel
+ EXCLUDE_FROM_ALL
)
diff --git a/kttsd/kcmkttsmgr/CMakeLists.txt b/kttsd/kcmkttsmgr/CMakeLists.txt
index bb2be6d..9a95476 100644
--- a/kttsd/kcmkttsmgr/CMakeLists.txt
+++ b/kttsd/kcmkttsmgr/CMakeLists.txt
@@ -30,7 +30,7 @@ tde_add_kpart( kcm_kttsd MODULE AUTOMOC
LINK
tdeio-shared
kttsd-shared
- DUMMY_kspeech_lib-static
+ kspeech_stub-static
DESTINATION ${PLUGIN_INSTALL_DIR}
)
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}
)
diff --git a/kttsd/kttsjobmgr/CMakeLists.txt b/kttsd/kttsjobmgr/CMakeLists.txt
index cc67a4a..b88a3a2 100644
--- a/kttsd/kttsjobmgr/CMakeLists.txt
+++ b/kttsd/kttsjobmgr/CMakeLists.txt
@@ -26,7 +26,7 @@ tde_add_kpart( libkttsjobmgrpart MODULE AUTOMOC
tdeio-shared
tdeparts-shared
kttsd-shared
- DUMMY_kspeech_lib-static
+ kspeech_stub-static
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kttsd/kttsmgr/CMakeLists.txt b/kttsd/kttsmgr/CMakeLists.txt
index c5010ab..0700094 100644
--- a/kttsd/kttsmgr/CMakeLists.txt
+++ b/kttsd/kttsmgr/CMakeLists.txt
@@ -25,7 +25,7 @@ tde_add_executable( kttsmgr AUTOMOC
tdeui-shared
tdeio-shared
tdeutils-shared
- DUMMY_kspeech_lib-static
+ kspeech_stub-static
DESTINATION ${BIN_INSTALL_DIR}
)
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 14:47:22 +0000