sr-dev May 2025

sr-dev@lists.kamailio.org

13 participants
122 discussions

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

git:master:1c4de241: cmake: Quiet fail for rabbit-mq
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 1c4de2410f8f5d3f600c96ac823c88911c58ae22 URL: https://github.com/kamailio/kamailio/commit/1c4de2410f8f5d3f600c96ac823c889… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-19T10:48:36Z cmake: Quiet fail for rabbit-mq - Remove extra find_package(pkgconfig) - Remove required version --- Modified: src/modules/kazoo/CMakeLists.txt Modified: src/modules/rabbitmq/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/1c4de2410f8f5d3f600c96ac823c889… Patch: https://github.com/kamailio/kamailio/commit/1c4de2410f8f5d3f600c96ac823c889… --- diff --git a/src/modules/kazoo/CMakeLists.txt b/src/modules/kazoo/CMakeLists.txt index 44b2e0b3c0e..d05ff75464c 100644 --- a/src/modules/kazoo/CMakeLists.txt +++ b/src/modules/kazoo/CMakeLists.txt @@ -18,7 +18,8 @@ pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) add_library(json-c::json-c ALIAS PkgConfig::json-c) # endif() -find_package(rabbitmq-c 0.13) +# rabbitmq provides cmake support for versions 0.13 and above. +find_package(rabbitmq-c QUIET) if(NOT rabbitmq-c_FOUND) message(STATUS "rabbitmq-c not found. looking with pkg-config") find_package(PkgConfig REQUIRED) @@ -26,7 +27,6 @@ if(NOT rabbitmq-c_FOUND) add_library(rabbitmq::rabbitmq ALIAS PkgConfig::rabbitmq-c) endif() -find_package(PkgConfig REQUIRED) pkg_check_modules(UUID REQUIRED IMPORTED_TARGET uuid) add_library(uuid::uuid ALIAS PkgConfig::UUID) diff --git a/src/modules/rabbitmq/CMakeLists.txt b/src/modules/rabbitmq/CMakeLists.txt index 9ad3b4c8112..e9bcef86b58 100644 --- a/src/modules/rabbitmq/CMakeLists.txt +++ b/src/modules/rabbitmq/CMakeLists.txt @@ -2,7 +2,8 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(rabbitmq-c 0.13 QUIET) +# rabbitmq provides cmake support for versions 0.13 and above. +find_package(rabbitmq-c QUIET) if(NOT rabbitmq-c_FOUND) message(STATUS "rabbitmq-c not found. looking with pkg-config") find_package(PkgConfig REQUIRED)

1 0

git:master:898f680d: cmake: Remove unnessecary components to be consistent
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 898f680d85b3e558038b41a14fa6f2ebca05bc94 URL: https://github.com/kamailio/kamailio/commit/898f680d85b3e558038b41a14fa6f2e… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-19T10:48:24Z cmake: Remove unnessecary components to be consistent --- Modified: src/modules/crypto/CMakeLists.txt Modified: src/modules/dnssec/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/898f680d85b3e558038b41a14fa6f2e… Patch: https://github.com/kamailio/kamailio/commit/898f680d85b3e558038b41a14fa6f2e… --- diff --git a/src/modules/crypto/CMakeLists.txt b/src/modules/crypto/CMakeLists.txt index 63d56fb6a8e..a111e1f2799 100644 --- a/src/modules/crypto/CMakeLists.txt +++ b/src/modules/crypto/CMakeLists.txt @@ -2,6 +2,6 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(OpenSSL REQUIRED COMPONENTS SSL Crypto) +find_package(OpenSSL REQUIRED) target_link_libraries(${module_name} PRIVATE OpenSSL::SSL OpenSSL::Crypto) diff --git a/src/modules/dnssec/CMakeLists.txt b/src/modules/dnssec/CMakeLists.txt index 82abef707b1..3177aff9a2f 100644 --- a/src/modules/dnssec/CMakeLists.txt +++ b/src/modules/dnssec/CMakeLists.txt @@ -2,7 +2,7 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(OpenSSL REQUIRED COMPONENTS SSL Crypto) +find_package(OpenSSL REQUIRED) find_package(Threads REQUIRED) # TODO: library libval not foud on recent distributions: whichi library is sres?

1 0

git:master:85b821b4: cmake: Remove unused groups
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 85b821b4b6e6cfaa5495d39bcd3ef2e1b939b499 URL: https://github.com/kamailio/kamailio/commit/85b821b4b6e6cfaa5495d39bcd3ef2e… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-19T10:47:54Z cmake: Remove unused groups --- Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/85b821b4b6e6cfaa5495d39bcd3ef2e… Patch: https://github.com/kamailio/kamailio/commit/85b821b4b6e6cfaa5495d39bcd3ef2e… --- diff --git a/cmake/groups.cmake b/cmake/groups.cmake index 96a16979de8..d71e60318a0 100644 --- a/cmake/groups.cmake +++ b/cmake/groups.cmake @@ -483,37 +483,6 @@ set(MODULE_GROUP_COMMON ${MOD_LIST_TLSDEPS} ) -# For db use (db modules, excluding drivers) module_group_db=$(mod_list_db) -set(MODULE_GROUP_DB ${MOD_LIST_DB}) - -# For mysql module_group_mysql_driver=$(mod_list_mysql) -# module_group_mysql=$(module_group_mysql_driver) $(module_group_db) -set(MODULE_GROUP_MYSQL_DRIVER ${MOD_LIST_MYSQL}) -set(MODULE_GROUP_MYSQL ${MODULE_GROUP_MYSQL_DRIVER} ${MODULE_GROUP_DB}) - -# For postgress module_group_postgres_driver=$(mod_list_postgres) -# module_group_postgres=$(module_group_postgres_driver) $(module_group_db) -set(MODULE_GROUP_POSTGRES_DRIVER ${MOD_LIST_POSTGRES}) -set(MODULE_GROUP_POSTGRES ${MODULE_GROUP_POSTGRES_DRIVER} ${MODULE_GROUP_DB}) - -# For sqlite module_group_sqlite_driver=$(mod_list_sqlite) -# module_group_sqlite=$(module_group_sqlite_driver) $(module_group_db) -set(MODULE_GROUP_SQLITE_DRIVER ${MOD_LIST_SQLITE}) -set(MODULE_GROUP_SQLITE ${MODULE_GROUP_SQLITE_DRIVER} ${MODULE_GROUP_DB}) - -# For radius -set(MODULE_GROUP_RADIUS ${MODULE_LIST_RADIUS}) - -# For presence kamailio modules -set(MODULE_GROUP_PRESENCE ${MOD_LIST_PRESENCE}) - -# For cassandra -set(MODULE_GROUP_CASSANDRA_DRIVER ${MODULE_LIST_CASSANDRA}) -set(MODULE_GROUP_CASSANDRA ${MODULE_GROUP_CASSANDRA_DRIVER} ${MODULE_GROUP_DB}) - -# For all modules not compiled by default -# list(FILTER MOD_LIST_ALL EXCLUDE REGEX "${MODULE_GROUP_DEFAULT}") - # for all protocols (excl. local ones such as unix, tcp, etc.) set(AVAILABLE_GROUPS ALL DEFAULT STANDARD COMMON)

1 0

git:master:165f2cd3: cmake: Add missing defintion
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 165f2cd3c2e1197b8d1986cbc2784a24c02e06e9 URL: https://github.com/kamailio/kamailio/commit/165f2cd3c2e1197b8d1986cbc2784a2… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-19T10:47:24Z cmake: Add missing defintion --- Modified: cmake/defs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/165f2cd3c2e1197b8d1986cbc2784a2… Patch: https://github.com/kamailio/kamailio/commit/165f2cd3c2e1197b8d1986cbc2784a2… --- diff --git a/cmake/defs.cmake b/cmake/defs.cmake index 6ec6ac59b72..7fa11e89093 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -108,6 +108,7 @@ option(CORE_TLS "CORE_TLS" OFF) if(${CORE_TLS}) set(RELEASE "${RELEASE}-tls") set(TLS_HOOKS OFF) + target_compile_definitions(common INTERFACE CORE_TLS) else() set(TLS_HOOKS ON) endif()

1 0

git:master:549643ec: cmake: Remove warning message
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 549643ec1e283b07e9fae274b6ed923065ba46e0 URL: https://github.com/kamailio/kamailio/commit/549643ec1e283b07e9fae274b6ed923… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-19T10:44:40Z cmake: Remove warning message --- Modified: src/modules/snmpstats/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/549643ec1e283b07e9fae274b6ed923… Patch: https://github.com/kamailio/kamailio/commit/549643ec1e283b07e9fae274b6ed923… --- diff --git a/src/modules/snmpstats/CMakeLists.txt b/src/modules/snmpstats/CMakeLists.txt index 0fc68b2c8df..fdcbe151d41 100644 --- a/src/modules/snmpstats/CMakeLists.txt +++ b/src/modules/snmpstats/CMakeLists.txt @@ -10,6 +10,6 @@ target_link_libraries(${module_name} PRIVATE NETSNMP::NETSNMP) install( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mibs - DESTINATION ${CMAKE_INSTALL_DATADIR}/snmp/ + DESTINATION ${CMAKE_INSTALL_DATADIR}/snmp OPTIONAL )

1 0

git:master:cf8cdb99: cmake: Warning if no modules/group were selected
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: cf8cdb99355e19a30460229633eaf087717ee44d URL: https://github.com/kamailio/kamailio/commit/cf8cdb99355e19a30460229633eaf08… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-19T08:15:11Z cmake: Warning if no modules/group were selected --- Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/cf8cdb99355e19a30460229633eaf08… Patch: https://github.com/kamailio/kamailio/commit/cf8cdb99355e19a30460229633eaf08… --- diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index cc303f0bb88..0decc1865ab 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -149,8 +149,14 @@ message(STATUS "Modules to be built: ${ADDED_MODULES_LIST}") # TODO: Comment is not showing. probably a bug in CMAKE # https://gitlab.kitware.com/cmake/cmake/-/issues/26571 add_custom_target(modules COMMENT "Building modules") -add_dependencies(modules ${ADDED_MODULES_LIST}) - +if(NOT ADDED_MODULES_LIST) + message( + WARNING + "No modules to build. Did you forget to add a module group or include module?" + ) +else() + add_dependencies(modules ${ADDED_MODULES_LIST}) +endif() get_property(ALL_MODULE_DOC_TARGETS GLOBAL PROPERTY ALL_MODULE_DOC_TARGETS) # message(STATUS "ALL_MODULE_DOC_TARGETS: ${ALL_MODULE_DOC_TARGETS}")

1 0

← Newer
1
2
3
4
5
6
7
...
13
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2025