sr-dev

sr-dev@lists.kamailio.org

4 participants
45459 discussions

git:master:f9bbac51: cmake: Fix wrong name of option
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: f9bbac5167e98952ef5b1764c3f2c4b6939fd25d URL: https://github.com/kamailio/kamailio/commit/f9bbac5167e98952ef5b1764c3f2c4b… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-05-19T16:58:32+03:00 cmake: Fix wrong name of option --- Modified: cmake/dbschema.cmake --- Diff: https://github.com/kamailio/kamailio/commit/f9bbac5167e98952ef5b1764c3f2c4b… Patch: https://github.com/kamailio/kamailio/commit/f9bbac5167e98952ef5b1764c3f2c4b… --- diff --git a/cmake/dbschema.cmake b/cmake/dbschema.cmake index db7ff430d92..eac256f17e2 100644 --- a/cmake/dbschema.cmake +++ b/cmake/dbschema.cmake @@ -19,8 +19,8 @@ else() add_custom_target(dbschema_clean COMMENT "Cleaning schemas for all dbs...") endif() - option(XSLT_VALIDATE, "Enable schema validation during XSL transformations" ON) - option(XSLT_VERBOSE, "Enable verbose output for XSL transformations" OFF) + option(XSLT_VALIDATE "Enable schema validation during XSL transformations" ON) + option(XSLT_VERBOSE "Enable verbose output for XSL transformations" OFF) set(XSLTPROC_FLAGS --xinclude) if(NOT ${XSLT_VALIDATE})

1 0

git:master:497b7d94: cmake: Add some comments
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 497b7d94b8d3575cf7399c8537e96297bcd4062b URL: https://github.com/kamailio/kamailio/commit/497b7d94b8d3575cf7399c8537e9629… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-05-19T16:58:32+03:00 cmake: Add some comments --- Modified: cmake/compiler-specific.cmake Modified: cmake/db_files.cmake Modified: cmake/dbschema.cmake Modified: cmake/os-specific.cmake Modified: src/CMakeLists.txt Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/497b7d94b8d3575cf7399c8537e9629… Patch: https://github.com/kamailio/kamailio/commit/497b7d94b8d3575cf7399c8537e9629…

1 0

git:master:782d9319: cmake: Add check and warning for module docs
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 782d93197c928f8856a7026c93aebd223c6cb682 URL: https://github.com/kamailio/kamailio/commit/782d93197c928f8856a7026c93aebd2… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-05-19T16:58:32+03:00 cmake: Add check and warning for module docs --- Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/782d93197c928f8856a7026c93aebd2… Patch: https://github.com/kamailio/kamailio/commit/782d93197c928f8856a7026c93aebd2… --- diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 33948dc9f6c..dea294090a6 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -107,8 +107,14 @@ function(add_module_group group_name group_modules) ) # Add the module to the list of added modules set_property(GLOBAL APPEND PROPERTY ADDED_MODULES_LIST ${module_name}) - docs_add_module(${group_name} ${module_name}) - set_property(GLOBAL APPEND PROPERTY ALL_MODULE_DOC_TARGETS ${module_name}_doc) + if(NOT EXISTS ${CMAKE_SOURCE_DIR}/src/modules/${module_name}/doc/${module_name}.xml) + message(WARNING "No documentation found for module ${module_name}.") + return() + else() + docs_add_module(${group_name} ${module_name}) + set_property(GLOBAL APPEND PROPERTY ALL_MODULE_DOC_TARGETS ${module_name}_doc) + endif() + else() message(FATAL_ERROR "Module directory ${module_path} does not exist.") endif()

1 0

git:master:478ddb1f: cmake: Fix build paths for dbschema.
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 478ddb1f38817ac4730d0f499c73046be26b6907 URL: https://github.com/kamailio/kamailio/commit/478ddb1f38817ac4730d0f499c73046… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-05-19T16:58:32+03:00 cmake: Fix build paths for dbschema. - Build artifcats of dbschema should be in utils folder --- Modified: cmake/dbschema.cmake --- Diff: https://github.com/kamailio/kamailio/commit/478ddb1f38817ac4730d0f499c73046… Patch: https://github.com/kamailio/kamailio/commit/478ddb1f38817ac4730d0f499c73046… --- diff --git a/cmake/dbschema.cmake b/cmake/dbschema.cmake index 515b1048b9b..a380281a295 100644 --- a/cmake/dbschema.cmake +++ b/cmake/dbschema.cmake @@ -62,7 +62,7 @@ else() add_custom_target( dbschema_${db_name} COMMAND ${CMAKE_COMMAND} -E make_directory "${db_name_folder}" - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/utils/kamctl COMMENT "Creating schemas for ${db_name}" ) @@ -86,7 +86,7 @@ else() PRE_BUILD COMMAND "XML_CATALOG_FILES=${CATALOG}" ${XSLTPROC_EXECUTABLE} ${XSLTPROC_FLAGS} --stringparam dir - ${CMAKE_CURRENT_BINARY_DIR}/${db_name_folder}/${folder_suffix} --stringparam prefix + ${CMAKE_BINARY_DIR}/utils/kamctl/${db_name_folder}/${folder_suffix} --stringparam prefix ${prefix} --stringparam db ${db_name} ${xsl_file} "kamailio-${table}.xml" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/src/lib/srdb1/schema" COMMENT "Processing ${table} for ${db_name}" @@ -95,7 +95,8 @@ else() add_custom_target( dbschema_${db_name}_clean - COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_CURRENT_BINARY_DIR}/${db_name_folder}" + COMMAND ${CMAKE_COMMAND} -E remove_directory + "${CMAKE_BINARY_DIR}/utils/kamctl/${db_name_folder}" COMMENT "Cleaning ${db_name} schema files" )

1 0

git:master:0550b630: cmake: Fix formatting and add some comments.
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 0550b6300703ec5536a033e1d4ba4d70ec53f83a URL: https://github.com/kamailio/kamailio/commit/0550b6300703ec5536a033e1d4ba4d7… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-05-19T16:58:32+03:00 cmake: Fix formatting and add some comments. - Remove unused replacement SRC_NAME to MAIN_NAME --- Modified: CMakeLists.txt Modified: src/CMakeLists.txt Modified: src/core/CMakeLists.txt Modified: src/modules/CMakeLists.txt Modified: src/modules/app_perl/CMakeLists.txt Modified: utils/kamcmd/CMakeLists.txt Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/0550b6300703ec5536a033e1d4ba4d7… Patch: https://github.com/kamailio/kamailio/commit/0550b6300703ec5536a033e1d4ba4d7…

1 0

git:master:08bfcad2: cmake: Better handling of doc generation dependencies
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 08bfcad2c34855dbadd3c9eafda72b38a6e65a1c URL: https://github.com/kamailio/kamailio/commit/08bfcad2c34855dbadd3c9eafda72b3… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-05-19T16:58:32+03:00 cmake: Better handling of doc generation dependencies --- Modified: cmake/modules-docs.cmake Modified: src/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/08bfcad2c34855dbadd3c9eafda72b3… Patch: https://github.com/kamailio/kamailio/commit/08bfcad2c34855dbadd3c9eafda72b3…

1 0

git:master:d3f85d8a: cmake: quote variables for expansion
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: d3f85d8a3b13a444ac66b440056aee8232cbae54 URL: https://github.com/kamailio/kamailio/commit/d3f85d8a3b13a444ac66b440056aee8… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-05-19T16:58:32+03:00 cmake: quote variables for expansion --- Modified: cmake/dbschema.cmake --- Diff: https://github.com/kamailio/kamailio/commit/d3f85d8a3b13a444ac66b440056aee8… Patch: https://github.com/kamailio/kamailio/commit/d3f85d8a3b13a444ac66b440056aee8… --- diff --git a/cmake/dbschema.cmake b/cmake/dbschema.cmake index c70e6aff79e..515b1048b9b 100644 --- a/cmake/dbschema.cmake +++ b/cmake/dbschema.cmake @@ -85,7 +85,7 @@ else() TARGET dbschema_${db_name} PRE_BUILD COMMAND - XML_CATALOG_FILES=${CATALOG} ${XSLTPROC_EXECUTABLE} ${XSLTPROC_FLAGS} --stringparam dir + "XML_CATALOG_FILES=${CATALOG}" ${XSLTPROC_EXECUTABLE} ${XSLTPROC_FLAGS} --stringparam dir ${CMAKE_CURRENT_BINARY_DIR}/${db_name_folder}/${folder_suffix} --stringparam prefix ${prefix} --stringparam db ${db_name} ${xsl_file} "kamailio-${table}.xml" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/src/lib/srdb1/schema"

1 0

git:master:3c9f6077: cmake: Use components to install groups
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 3c9f60772e04edbc853d8162543b3b0af7f46217 URL: https://github.com/kamailio/kamailio/commit/3c9f60772e04edbc853d8162543b3b0… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xenakiskaramanos(a)gmail.com> Date: 2025-05-19T16:58:32+03:00 cmake: Use components to install groups - kamailio-core for anything related to core - group_name as defined in groups.cmake - Preferably use K-variants instead of DEFAULT,STANDARD - Refactor kamctl and dbschema CMakLists for component based installation --- Added: cmake/db_files.cmake Added: cmake/dbschema.cmake Modified: cmake/modules-docs.cmake Modified: src/CMakeLists.txt Modified: src/modules/CMakeLists.txt Modified: src/modules/app_perl/CMakeLists.txt Modified: src/modules/auth_radius/CMakeLists.txt Modified: src/modules/db_berkeley/CMakeLists.txt Modified: src/modules/db_mongodb/CMakeLists.txt Modified: src/modules/db_mysql/CMakeLists.txt Modified: src/modules/db_oracle/CMakeLists.txt Modified: src/modules/db_postgres/CMakeLists.txt Modified: src/modules/db_redis/CMakeLists.txt Modified: src/modules/db_sqlite/CMakeLists.txt Modified: src/modules/db_text/CMakeLists.txt Modified: src/modules/snmpstats/CMakeLists.txt Modified: src/modules/tls/CMakeLists.txt Modified: src/modules/xhttp_pi/CMakeLists.txt Modified: utils/db_berkeley/CMakeLists.txt Modified: utils/kamcmd/CMakeLists.txt Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/3c9f60772e04edbc853d8162543b3b0… Patch: https://github.com/kamailio/kamailio/commit/3c9f60772e04edbc853d8162543b3b0…

1 0

git:master:8cc60c03: cmake: If BUILD_DOC options is set to ON, include doc and man targets to default target!
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 8cc60c03a25a2a9b1f7fbe93e08c21165336ad0a URL: https://github.com/kamailio/kamailio/commit/8cc60c03a25a2a9b1f7fbe93e08c211… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-19T11:11:11Z cmake: If BUILD_DOC options is set to ON, include doc and man targets to default target! --- Modified: src/CMakeLists.txt Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/8cc60c03a25a2a9b1f7fbe93e08c211… Patch: https://github.com/kamailio/kamailio/commit/8cc60c03a25a2a9b1f7fbe93e08c211… --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c9933ab7ede..724f964e64f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -73,6 +73,12 @@ else() ${CMAKE_CURRENT_BINARY_DIR}/core/cfg.tab.h PROPERTIES GENERATED TRUE ) endif() + +if(BUILD_DOC) + set(docs_in_all_target ALL) +else() + set(docs_in_all_target "") +endif() # ----------------------- # ----------------------- @@ -159,8 +165,9 @@ add_custom_command( ) add_custom_target( - man DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MAIN_NAME}.8 - ${CMAKE_CURRENT_BINARY_DIR}/${MAIN_NAME}.cfg.5 + man + ${docs_in_all_target} + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MAIN_NAME}.8 ${CMAKE_CURRENT_BINARY_DIR}/${MAIN_NAME}.cfg.5 ) add_dependencies(man kamctl_man) add_dependencies(man kamcmd_man) diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 0decc1865ab..430e88af1f9 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -163,6 +163,7 @@ get_property(ALL_MODULE_DOC_TARGETS GLOBAL PROPERTY ALL_MODULE_DOC_TARGETS) # Add a kamailio_docs target that depends on all module documentation targets add_custom_target( kamailio_docs + ${docs_in_all_target} DEPENDS ${ALL_MODULE_DOC_TARGETS} COMMENT "Generating Kamailio documentation" )

1 0

git:master:42e1a9c3: cmake: Remove find_package for ORTP and Mediastreamer2 libraries
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 42e1a9c3c5df65cae8a5f559f6fe47a6de5f6fac URL: https://github.com/kamailio/kamailio/commit/42e1a9c3c5df65cae8a5f559f6fe47a… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-19T10:48:51Z cmake: Remove find_package for ORTP and Mediastreamer2 libraries - Use pkg-config instead because their cmake configs are not up to standard and complicates things --- Modified: src/modules/rtp_media_server/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/42e1a9c3c5df65cae8a5f559f6fe47a… Patch: https://github.com/kamailio/kamailio/commit/42e1a9c3c5df65cae8a5f559f6fe47a… --- diff --git a/src/modules/rtp_media_server/CMakeLists.txt b/src/modules/rtp_media_server/CMakeLists.txt index 59a1d868d34..15114891902 100644 --- a/src/modules/rtp_media_server/CMakeLists.txt +++ b/src/modules/rtp_media_server/CMakeLists.txt @@ -2,18 +2,15 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(ortp QUIET) -if(NOT ortp_FOUND) - find_package(PkgConfig REQUIRED) - pkg_check_modules(ortp REQUIRED IMPORTED_TARGET ortp) - add_library(ortp ALIAS PkgConfig::ortp) -endif() +find_package(PkgConfig REQUIRED) -find_package(mediastreamer2 QUIET) -if(NOT mediastreamer2_FOUND) - find_package(PkgConfig REQUIRED) - pkg_check_modules(mediastreamer2 REQUIRED IMPORTED_TARGET mediastreamer) - add_library(mediastreamer2 ALIAS PkgConfig::mediastreamer2) -endif() +# ortp and mediastreamer2 do have cmake support on newer version but +# is not up to standard and complicates things. +# So we use pkg-config to find them. +pkg_check_modules(ortp REQUIRED IMPORTED_TARGET ortp) +add_library(ortp ALIAS PkgConfig::ortp) + +pkg_check_modules(mediastreamer2 REQUIRED IMPORTED_TARGET mediastreamer) +add_library(mediastreamer2 ALIAS PkgConfig::mediastreamer2) target_link_libraries(${module_name} PRIVATE ortp mediastreamer2)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev