Module: sems Branch: master Commit: 6f049cb7b8599243d3f23f6ff88c7dab4304a059 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=6f049cb7b8599243d3f23f6ff88c7dab4304a059
Author: Peter Lemenkov <[email protected]> Committer: Peter Lemenkov <[email protected]> Date: Sat Oct 2 23:08:00 2010 +0400 Simplify docs installing Signed-off-by: Peter Lemenkov <[email protected]> --- apps/dsm/CMakeLists.txt | 5 ++--- cmake/doc.rules.txt | 26 +++++++++++++++----------- cmake/module.rules.txt | 10 ++++++++++ core/CMakeLists.txt | 5 ++++- core/plug-in/adpcm/CMakeLists.txt | 3 +-- core/plug-in/g722/CMakeLists.txt | 2 +- core/plug-in/g729/CMakeLists.txt | 2 +- core/plug-in/stats/CMakeLists.txt | 2 +- 8 files changed, 35 insertions(+), 20 deletions(-) diff --git a/apps/dsm/CMakeLists.txt b/apps/dsm/CMakeLists.txt index 2a98672..6025c4e 100644 --- a/apps/dsm/CMakeLists.txt +++ b/apps/dsm/CMakeLists.txt @@ -5,12 +5,11 @@ ADD_SUBDIRECTORY (mods) SET(sems_module_name dsm) SET(sems_config_files dsm_in_prompts dsm_out_prompts) -SET(doc_files +SET(dsm_doc_files ../../doc/dsm/Readme.dsm.txt ../../doc/dsm/dsm_syntax.txt ../../doc/dsm/dsm_todo.txt ) -SET(doc_dirs ../../doc/dsm/examples) +SET(dsm_doc_dirs ../../doc/dsm) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/doc.rules.txt) diff --git a/cmake/doc.rules.txt b/cmake/doc.rules.txt index 3f9f8c1..727c789 100644 --- a/cmake/doc.rules.txt +++ b/cmake/doc.rules.txt @@ -1,12 +1,16 @@ -FOREACH (doc_file ${doc_files}) - INSTALL( - FILES ${doc_file} DESTINATION ${SEMS_DOC_PREFIX}/sems-${SEMS_VERSION} - ) -ENDFOREACH(doc_file ${doc_files}) +MACRO(SEMS_INSTALL_DOCS doc_files doc_dirs) -FOREACH (doc_dir ${doc_dirs}) - INSTALL( - DIRECTORY ${doc_dir} - DESTINATION ${SEMS_DOC_PREFIX}/sems-${SEMS_VERSION} - ) -ENDFOREACH(doc_dir ${doc_dirs}) + FOREACH (doc_file ${doc_files}) + INSTALL( + FILES ${doc_file} DESTINATION ${SEMS_DOC_PREFIX}/sems-${SEMS_VERSION} + ) + ENDFOREACH(doc_file ${doc_files}) + + FOREACH (doc_dir ${doc_dirs}) + INSTALL( + DIRECTORY ${doc_dir} + DESTINATION ${SEMS_DOC_PREFIX}/sems-${SEMS_VERSION} + ) + ENDFOREACH(doc_dir ${doc_dirs}) + +ENDMACRO(SEMS_INSTALL_DOCS) diff --git a/cmake/module.rules.txt b/cmake/module.rules.txt index 6299ee0..90d88f1 100644 --- a/cmake/module.rules.txt +++ b/cmake/module.rules.txt @@ -4,6 +4,8 @@ # issue then this name is equals to external library, our module links to. # E.g. the issue, then speex module should be linked to -lspeex +INCLUDE(${CMAKE_SOURCE_DIR}/cmake/doc.rules.txt) + ADD_LIBRARY(sems_${sems_module_name} SHARED ${${sems_module_name}_SRCS}) ADD_DEFINITIONS(-DMOD_NAME=\\\"${sems_module_name}\\\") @@ -18,3 +20,11 @@ INSTALL( TARGETS sems_${sems_module_name} LIBRARY DESTINATION ${SEMS_EXEC_PREFIX}/${SEMS_LIBDIR}/sems/plug-in/ ) + +IF(NOT DEFINED ${sems_module_name}_docs) + IF(EXISTS ${CMAKE_SOURCE_DIR}/doc/Readme.${sems_module_name}.txt) + SET(${sems_module_name}_docs ${CMAKE_SOURCE_DIR}/doc/Readme.${sems_module_name}.txt) + ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/doc/Readme.${sems_module_name}.txt) +ENDIF(NOT DEFINED ${sems_module_name}_docs) + +SEMS_INSTALL_DOCS("${${sems_module_name}_docs}" "${${sems_module_name}_doc_dirs}") diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 554fbc6..68a2270 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -46,6 +46,8 @@ IF(ZRTP_FOUND) INSTALL(FILES ./etc/zrtp.conf DESTINATION ${SEMS_CFG_PREFIX}/etc/sems/etc/) ENDIF(ZRTP_FOUND) +INCLUDE(${CMAKE_SOURCE_DIR}/cmake/doc.rules.txt) + SET(doc_dirs ../doc/figures) SET(doc_files ../doc/Applications.txt @@ -58,5 +60,6 @@ SET(doc_files ../doc/WHATSNEW_0.10 ) +SEMS_INSTALL_DOCS("${doc_files}" "${doc_dirs}") + INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/doc.rules.txt) diff --git a/core/plug-in/adpcm/CMakeLists.txt b/core/plug-in/adpcm/CMakeLists.txt index da3d024..591c8e4 100644 --- a/core/plug-in/adpcm/CMakeLists.txt +++ b/core/plug-in/adpcm/CMakeLists.txt @@ -9,6 +9,5 @@ g72x.c ) SET(sems_module_name adpcm) -SET(doc_files README_G711) +SET(adpcm_doc_files README_G711) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/doc.rules.txt) diff --git a/core/plug-in/g722/CMakeLists.txt b/core/plug-in/g722/CMakeLists.txt index 897f993..5ff77b5 100644 --- a/core/plug-in/g722/CMakeLists.txt +++ b/core/plug-in/g722/CMakeLists.txt @@ -6,6 +6,6 @@ g722.c SET(sems_module_name g722) SET(sems_module_libs spandsp) -SET(doc_files Readme.g722codec) +SET(g722_doc_files Readme.g722codec) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/doc.rules.txt) diff --git a/core/plug-in/g729/CMakeLists.txt b/core/plug-in/g729/CMakeLists.txt index 76a552e..1d60ba9 100644 --- a/core/plug-in/g729/CMakeLists.txt +++ b/core/plug-in/g729/CMakeLists.txt @@ -4,6 +4,6 @@ g729.c SET(sems_module_name g729) SET(sems_module_libs speech core) -SET(doc_files Readme.g729codec) +SET(g729_doc_files Readme.g729.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/doc.rules.txt) diff --git a/core/plug-in/stats/CMakeLists.txt b/core/plug-in/stats/CMakeLists.txt index ef89b6f..55a4b72 100644 --- a/core/plug-in/stats/CMakeLists.txt +++ b/core/plug-in/stats/CMakeLists.txt @@ -18,7 +18,7 @@ StatsUDPServer.cpp ) SET(sems_module_name stats) -SET(doc_files README.stats) +SET(stats_doc_files README.stats) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt) INCLUDE(${CMAKE_SOURCE_DIR}/cmake/doc.rules.txt) _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
