Module: sems Branch: master Commit: 3d257844109d5206b5e30b51e25bc1f0be19798b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=3d257844109d5206b5e30b51e25bc1f0be19798b
Author: Peter Lemenkov <[email protected]> Committer: Peter Lemenkov <[email protected]> Date: Sun Oct 3 15:03:37 2010 +0400 Simplify installing of audio files Signed-off-by: Peter Lemenkov <[email protected]> --- apps/annrecorder/CMakeLists.txt | 3 +-- apps/conference/CMakeLists.txt | 3 +-- apps/precoded_announce/CMakeLists.txt | 3 +-- apps/voicebox/CMakeLists.txt | 3 +-- apps/voicemail/CMakeLists.txt | 3 +-- apps/webconference/CMakeLists.txt | 3 +-- cmake/audio.rules.txt | 12 +++++++----- cmake/module.rules.txt | 5 +++++ core/CMakeLists.txt | 5 +++-- 9 files changed, 21 insertions(+), 19 deletions(-) diff --git a/apps/annrecorder/CMakeLists.txt b/apps/annrecorder/CMakeLists.txt index 171c1d6..cc920d8 100644 --- a/apps/annrecorder/CMakeLists.txt +++ b/apps/annrecorder/CMakeLists.txt @@ -2,7 +2,7 @@ set (annrecorder_SRCS AnnRecorder.cpp ) -set (audio_files +set (annrecorder_audio_files beep.wav bye.wav confirm.wav @@ -14,4 +14,3 @@ your_prompt.wav SET(sems_module_name annrecorder) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) diff --git a/apps/conference/CMakeLists.txt b/apps/conference/CMakeLists.txt index 8e4bc04..23dea13 100644 --- a/apps/conference/CMakeLists.txt +++ b/apps/conference/CMakeLists.txt @@ -2,7 +2,7 @@ set (conference_SRCS Conference.cpp ) -set (audio_files +set (conference_audio_files beep.wav first_participant.wav ) @@ -22,4 +22,3 @@ ENDIF(MYSQLPP_FOUND) SET(sems_module_name conference) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) diff --git a/apps/precoded_announce/CMakeLists.txt b/apps/precoded_announce/CMakeLists.txt index 1ace09a..4ae2b03 100644 --- a/apps/precoded_announce/CMakeLists.txt +++ b/apps/precoded_announce/CMakeLists.txt @@ -2,10 +2,9 @@ set (precoded_announce_SRCS PrecodedAnnounce.cpp ) -set (audio_files +set (precoded_announce_audio_files test.predef ) SET(sems_module_name precoded_announce) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) diff --git a/apps/voicebox/CMakeLists.txt b/apps/voicebox/CMakeLists.txt index 9c3a5fc..dded587 100644 --- a/apps/voicebox/CMakeLists.txt +++ b/apps/voicebox/CMakeLists.txt @@ -3,7 +3,7 @@ Voicebox.cpp VoiceboxDialog.cpp ) -set (audio_files +set (voicebox_audio_files 0.wav 1.wav 10.wav @@ -64,4 +64,3 @@ you_have.wav SET(sems_module_name voicebox) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) diff --git a/apps/voicemail/CMakeLists.txt b/apps/voicemail/CMakeLists.txt index e869605..794191b 100644 --- a/apps/voicemail/CMakeLists.txt +++ b/apps/voicemail/CMakeLists.txt @@ -5,7 +5,7 @@ AnswerMachine.cpp EmailTemplate.cpp ) -set (audio_files +set (voicemail_audio_files beep.wav default_en.wav ) @@ -23,4 +23,3 @@ default_en.wav SET(sems_module_name voicemail) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) diff --git a/apps/webconference/CMakeLists.txt b/apps/webconference/CMakeLists.txt index 0e9462d..4147115 100644 --- a/apps/webconference/CMakeLists.txt +++ b/apps/webconference/CMakeLists.txt @@ -5,7 +5,7 @@ WebConference.cpp WebConferenceDialog.cpp ) -set (audio_files +set (webconference_audio_files 0.wav 1.wav 2.wav @@ -25,4 +25,3 @@ wrong_pin.wav SET(sems_module_name webconference) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) diff --git a/cmake/audio.rules.txt b/cmake/audio.rules.txt index 170b821..e35cf4c 100644 --- a/cmake/audio.rules.txt +++ b/cmake/audio.rules.txt @@ -1,5 +1,7 @@ -FOREACH (audio_file ${audio_files}) - INSTALL( - FILES wav/${audio_file} DESTINATION ${SEMS_AUDIO_PREFIX}/sems/audio/${sems_module_name} - ) -ENDFOREACH(audio_file ${audio_files}) +MACRO(SEMS_INSTALL_AUDIO module_name audio_files) + FOREACH (audio_file ${audio_files}) + INSTALL( + FILES wav/${audio_file} DESTINATION ${SEMS_AUDIO_PREFIX}/sems/audio/${sems_module_name} + ) + ENDFOREACH(audio_file ${audio_files}) +ENDMACRO(SEMS_INSTALL_AUDIO) diff --git a/cmake/module.rules.txt b/cmake/module.rules.txt index 20b6285..af0694a 100644 --- a/cmake/module.rules.txt +++ b/cmake/module.rules.txt @@ -6,6 +6,7 @@ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/doc.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) +INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) ADD_LIBRARY(sems_${sems_module_name} SHARED ${${sems_module_name}_SRCS}) @@ -35,3 +36,7 @@ IF(NOT DEFINED ${sems_module_name}_config_files) ELSE(NOT DEFINED ${sems_module_name}_config_files) SEMS_INSTALL_CONFIGS("${${sems_module_name}_config_files}") ENDIF(NOT DEFINED ${sems_module_name}_config_files) + +IF(DEFINED ${sems_module_name}_audio_files) + SEMS_INSTALL_AUDIO("${sems_module_name}" "${${sems_module_name}_audio_files}") +ENDIF(DEFINED ${sems_module_name}_audio_files) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 68a2270..ad04b10 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -1,3 +1,5 @@ +INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) + FILE (GLOB sems_SRCS "*.cpp" "sip/*.cpp") set (audio_files @@ -61,5 +63,4 @@ SET(doc_files ) SEMS_INSTALL_DOCS("${doc_files}" "${doc_dirs}") - -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) +SEMS_INSTALL_AUDIO("" "${audio_files}") _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
