sr-dev

sr-dev@lists.kamailio.org

1 participants
44977 discussions

git:6.0:f08adc56: cmake/json: Use CONFIG mode
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: f08adc567b19721b1bf515a2b1595fed28152177 URL: https://github.com/kamailio/kamailio/commit/f08adc567b19721b1bf515a2b1595fe… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:27:05Z cmake/json: Use CONFIG mode (cherry picked from commit 532744eebf1014939c4ccd9a6aa4e7d6fbb454ac) --- Modified: src/modules/json/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/f08adc567b19721b1bf515a2b1595fe… Patch: https://github.com/kamailio/kamailio/commit/f08adc567b19721b1bf515a2b1595fe… --- diff --git a/src/modules/json/CMakeLists.txt b/src/modules/json/CMakeLists.txt index c4cbf81440c..72df4d390f5 100644 --- a/src/modules/json/CMakeLists.txt +++ b/src/modules/json/CMakeLists.txt @@ -2,7 +2,8 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) -find_package(json-c QUIET) +find_package(json-c CONFIG) + if(NOT json-c_FOUND) message(STATUS "json-c not found. looking with pkg-config") find_package(PkgConfig REQUIRED)

1 0

git:6.0:5da84593: cmake: fix CPL definition
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 5da8459301f0a9d74b9c9b0f8e6e5890c194a8c2 URL: https://github.com/kamailio/kamailio/commit/5da8459301f0a9d74b9c9b0f8e6e589… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:21:36Z cmake: fix CPL definition (cherry picked from commit feb371852ea9b53a1dd95fec0db0943c5fb160ad) --- Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/5da8459301f0a9d74b9c9b0f8e6e589… Patch: https://github.com/kamailio/kamailio/commit/5da8459301f0a9d74b9c9b0f8e6e589… --- diff --git a/cmake/groups.cmake b/cmake/groups.cmake index 9cd7ddf77dc..73ef6d632dd 100644 --- a/cmake/groups.cmake +++ b/cmake/groups.cmake @@ -167,7 +167,7 @@ set(MOD_LIST_POSTGRES db_postgres) set(MOD_LIST_UNIXODBC db_unixodbc) # * modules depending on xml2 library -set(MOD_LIST_CPLC cplc) +set(MOD_LIST_CPL cplc) # * modules depending on xml2 library set(MOD_LIST_XMLDEPS xhttp_pi xmlrpc xmlops) @@ -385,7 +385,7 @@ set(MOD_LIST_ALL ${MOD_LIST_UNIXODBC} ${MOD_LIST_XMLDEPS} ${MOD_LIST_PERLDEPS} - ${MOD_LIST_CPLC} + ${MOD_LIST_CPL} ${MOD_LIST_XMPP} ${MOD_LIST_BERKELEY} ${MOD_LIST_UTILS}

1 0

git:6.0:7a174649: cmake/perl: Install files / Add perl user link and def options
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 7a17464946f8027e9d66497a44357d7f0eac64a2 URL: https://github.com/kamailio/kamailio/commit/7a17464946f8027e9d66497a44357d7… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:21:26Z cmake/perl: Install files / Add perl user link and def options - Fix perl extra_c_flags parsing by using SHELL: - Add user option PERL_LDOPTS to define extra ldopts - Add user option PERL_CCOPTS to define extra defs - Add new generated file to compilation - Add new target for sgml docs - Add install directives for perl libraries (cherry picked from commit f4d7e298bb351be5f12652083bd5e37109748169) --- Modified: src/modules/app_perl/CMakeLists.txt Modified: src/modules/db_perlvdb/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/7a17464946f8027e9d66497a44357d7… Patch: https://github.com/kamailio/kamailio/commit/7a17464946f8027e9d66497a44357d7…

1 0

git:6.0:3adaab6c: cmake: Install snmpstats files
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 3adaab6c56657bc73cd83e0b7bbcd158efb070c1 URL: https://github.com/kamailio/kamailio/commit/3adaab6c56657bc73cd83e0b7bbcd15… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:21:15Z cmake: Install snmpstats files (cherry picked from commit f69b22ce3cdc2c06739c11f19c9ebeb5eb1727f3) --- Modified: src/modules/snmpstats/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/3adaab6c56657bc73cd83e0b7bbcd15… Patch: https://github.com/kamailio/kamailio/commit/3adaab6c56657bc73cd83e0b7bbcd15… --- diff --git a/src/modules/snmpstats/CMakeLists.txt b/src/modules/snmpstats/CMakeLists.txt index fa3980030db..ac416979da7 100644 --- a/src/modules/snmpstats/CMakeLists.txt +++ b/src/modules/snmpstats/CMakeLists.txt @@ -7,3 +7,8 @@ find_package(NETSNMP REQUIRED) # TODO: Compiles fine but need to do some more verifcation target_link_libraries(${module_name} PRIVATE NETSNMP::NETSNMP) + +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mibs + DESTINATION ${CMAKE_INSTALL_DATADIR}/snmp/ + OPTIONAL)

1 0

git:6.0:e4e66928: cmake: Fix naming to be clear we want the CLIENT version
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: e4e669286264cc7e7ce6aab92c68a486311de708 URL: https://github.com/kamailio/kamailio/commit/e4e669286264cc7e7ce6aab92c68a48… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:21:04Z cmake: Fix naming to be clear we want the CLIENT version (cherry picked from commit 640bd4fb7529ad8b0a9415775679dca5e64c52be) --- Added: cmake/modules/FindLibfreeradiusClient.cmake Modified: cmake/modules/FindRadius.cmake Removed: cmake/modules/FindLibfreeradius.cmake --- Diff: https://github.com/kamailio/kamailio/commit/e4e669286264cc7e7ce6aab92c68a48… Patch: https://github.com/kamailio/kamailio/commit/e4e669286264cc7e7ce6aab92c68a48…

1 0

git:6.0:5ce31280: cmake: Fix typo
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: 5ce31280e1c4988408b4b77833947ae0cece4c83 URL: https://github.com/kamailio/kamailio/commit/5ce31280e1c4988408b4b77833947ae… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:20:56Z cmake: Fix typo (cherry picked from commit 8d1b60bc7f21fe9d0fadd1df926fee931966f34e) --- Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/5ce31280e1c4988408b4b77833947ae… Patch: https://github.com/kamailio/kamailio/commit/5ce31280e1c4988408b4b77833947ae… --- diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index 10ef2cf9db8..ca8a4f20660 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -264,7 +264,7 @@ else() dbschema_${db_name} COMMAND ${CMAKE_COMMAND} -E make_directory "${db_name_folder}" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Creating scehmas for ${db_name}") + COMMENT "Creating schemas for ${db_name}") # Loop through each table and add a command for xsltproc foreach(table ${EXTRACTED_TABLES})

1 0

git:6.0:ff20204c: cmake/sctp: Search for libsctp and error if not found
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: ff20204c0163d56964036bdfba5d9325cd74c90e URL: https://github.com/kamailio/kamailio/commit/ff20204c0163d56964036bdfba5d932… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:20:22Z cmake/sctp: Search for libsctp and error if not found (cherry picked from commit 9b7719a61ab02c93939e3681cb90e9fa04f3ac5d) --- Modified: src/modules/sctp/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/ff20204c0163d56964036bdfba5d932… Patch: https://github.com/kamailio/kamailio/commit/ff20204c0163d56964036bdfba5d932… --- diff --git a/src/modules/sctp/CMakeLists.txt b/src/modules/sctp/CMakeLists.txt index 5d8cb523a49..22e51fd7c08 100644 --- a/src/modules/sctp/CMakeLists.txt +++ b/src/modules/sctp/CMakeLists.txt @@ -2,6 +2,23 @@ file(GLOB MODULE_SOURCES "*.c") add_library(${module_name} SHARED ${MODULE_SOURCES}) +# TODO: find include file required +find_path( + SCTP_INCLUDE_DIR + NAMES sctp.h + PATHS /usr/include /usr/local/include /usr/include/netinet) + +if(NOT SCTP_INCLUDE_DIR) + message(FATAL_ERROR "sctp.h not found. maybe missing libsctp-dev?") +endif() + +target_include_directories(${module_name} PRIVATE ${SCTP_INCLUDE_DIR}) + +find_library( + SCTP_LIBRARY + NAMES sctp + PATHS /usr/lib /usr/local/lib) + if(UNIX) - target_link_libraries(${module_name} PRIVATE -lsctp) + target_link_libraries(${module_name} PRIVATE ${SCTP_LIBRARY}) endif()

1 0

git:6.0:aef5f6c4: cmake: Link with correct Erlang target
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: aef5f6c422981a36a1eac3d93079d8aa930c3810 URL: https://github.com/kamailio/kamailio/commit/aef5f6c422981a36a1eac3d93079d8a… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:20:12Z cmake: Link with correct Erlang target (cherry picked from commit 2dbd3d47cdbd55365fcb37b48a30c3224b8af810) --- Modified: src/modules/erlang/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/aef5f6c422981a36a1eac3d93079d8a… Patch: https://github.com/kamailio/kamailio/commit/aef5f6c422981a36a1eac3d93079d8a… --- diff --git a/src/modules/erlang/CMakeLists.txt b/src/modules/erlang/CMakeLists.txt index 16c4be64bfd..db92655b497 100644 --- a/src/modules/erlang/CMakeLists.txt +++ b/src/modules/erlang/CMakeLists.txt @@ -5,4 +5,6 @@ add_library(${module_name} SHARED ${MODULE_SOURCES}) # erlang-dev find_package(Erlang REQUIRED) -target_link_libraries(${module_name} PRIVATE Erlang::EI) +target_link_libraries(${module_name} PRIVATE Erlang::Erlang) +target_include_directories(${module_name} PRIVATE ${Erlang_INCLUDE_DIRS}) +target_compile_definitions(${module_name} PRIVATE _REENTRANT)

1 0

git:6.0:fa54a06f: cmake/Radius: Add libfreeradius support
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: 6.0 Commit: fa54a06f165f7d6a0c49a8653f2ed71fe775dbc4 URL: https://github.com/kamailio/kamailio/commit/fa54a06f165f7d6a0c49a8653f2ed71… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2025-01-29T10:19:58Z cmake/Radius: Add libfreeradius support - Add libfreeradius.cmake to search for libfreeradius-client - Link modules with correct libraries paths - Fix description (cherry picked from commit 53bd567dd7444a8145aa876d82db2c6b579a7e19) --- Added: cmake/modules/FindLibfreeradius.cmake Modified: cmake/modules/FindRadius.cmake Modified: src/modules/acc_radius/CMakeLists.txt Modified: src/modules/auth_radius/CMakeLists.txt Modified: src/modules/misc_radius/CMakeLists.txt Modified: src/modules/peering/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/fa54a06f165f7d6a0c49a8653f2ed71… Patch: https://github.com/kamailio/kamailio/commit/fa54a06f165f7d6a0c49a8653f2ed71…

1 0

git:master:8ebae54c: cmake: Use pkg-config instead for json-c dev package.
by Xenofon Karamanos 29 Jan '25

29 Jan '25

Module: kamailio Branch: master Commit: 8ebae54cff261b95fcece3be3719da511cc35084 URL: https://github.com/kamailio/kamailio/commit/8ebae54cff261b95fcece3be3719da5… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-29T10:07:24Z cmake: Use pkg-config instead for json-c dev package. --- Modified: src/modules/nsq/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/8ebae54cff261b95fcece3be3719da5… Patch: https://github.com/kamailio/kamailio/commit/8ebae54cff261b95fcece3be3719da5… --- diff --git a/src/modules/nsq/CMakeLists.txt b/src/modules/nsq/CMakeLists.txt index b4a482c2a47..e6acfa9a2f7 100644 --- a/src/modules/nsq/CMakeLists.txt +++ b/src/modules/nsq/CMakeLists.txt @@ -4,13 +4,19 @@ add_library(${module_name} SHARED ${MODULE_SOURCES}) find_package(Libev REQUIRED) -find_package(json-c QUIET) -if(NOT json-c_FOUND) - message(STATUS "json-c not found. looking with pkg-config") - find_package(PkgConfig REQUIRED) - pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) - add_library(json-c::json-c ALIAS PkgConfig::json-c) -endif() +# TODO: When we have a proper cmake config file for json-c for most OS, we can +# use that instead of pkg-config. +# json-c v 0.14 and 0.15 have wrong include directories in their cmake config +# files. uncomment the following line when we have a proper cmake config file +# for json-c for most OS. +# find_package(json-c 0.16 CONFIG) + +# if(NOT json-c_FOUND) +# message(STATUS "json-c not found. looking with pkg-config") +find_package(PkgConfig REQUIRED) +pkg_check_modules(json-c REQUIRED IMPORTED_TARGET json-c) +add_library(json-c::json-c ALIAS PkgConfig::json-c) +# endif() find_package(CURL REQUIRED)

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