Module: kamailio
Branch: master
Commit: a1bdef919414173e8327a8dd65ecaa2fca279d6a
URL: https://github.com/kamailio/kamailio/commit/a1bdef919414173e8327a8dd65ecaa2…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2025-01-20T10:54:14+01:00
cmake: messages about not finding docs-related tools made status
- they should not be needed for development and usual installation,
warning makes it look like something …
[View More]relevant cannot be done
---
Modified: cmake/modules-docs.cmake
---
Diff: https://github.com/kamailio/kamailio/commit/a1bdef919414173e8327a8dd65ecaa2…
Patch: https://github.com/kamailio/kamailio/commit/a1bdef919414173e8327a8dd65ecaa2…
---
diff --git a/cmake/modules-docs.cmake b/cmake/modules-docs.cmake
index 10b1b70a8f2..721ba7d0b45 100644
--- a/cmake/modules-docs.cmake
+++ b/cmake/modules-docs.cmake
@@ -6,12 +6,12 @@ find_program(LYNX_EXECUTABLE lynx QUIET)
find_program(DOCBOOK2X_EXECUTABLE docbook2x-man QUIET)
if(BUILD_DOC AND (NOT XSLTPROC_EXECUTABLE OR NOT LYNX_EXECUTABLE))
- message(WARNING "xsltproc or lynx not found but required for doc generation.")
+ message(STATUS "xsltproc or lynx not found but required for doc generation.")
set(BUILD_DOC OFF)
endif()
if(BUILD_DOC AND (NOT DOCBOOK2X_EXECUTABLE))
- message(WARNING "docbook2x-man not found but required for man generation.")
+ message(STATUS "docbook2x-man not found but required for man generation.")
set(BUILD_DOC OFF)
endif()
[View Less]
Module: kamailio
Branch: master
Commit: eeffe798b85d4f8c580c221b0e655b1b49a7420f
URL: https://github.com/kamailio/kamailio/commit/eeffe798b85d4f8c580c221b0e655b1…
Author: Xenofon Karamanos <xk(a)gilawa.com>
Committer: Xenofon Karamanos <xk(a)gilawa.com>
Date: 2025-01-17T14:56:31Z
cmake: Fix ignoring excluded module
- When adding groups, we now also check if they contain a user-excluded module.
---
Modified: src/modules/CMakeLists.txt
---
Diff: https://github.com/kamailio/…
[View More]kamailio/commit/eeffe798b85d4f8c580c221b0e655b1…
Patch: https://github.com/kamailio/kamailio/commit/eeffe798b85d4f8c580c221b0e655b1…
---
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 22c1341db8a..be55da5f065 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -4,6 +4,7 @@ set(MODULES_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
# Initialize a global property to track added modules
set_property(GLOBAL PROPERTY ADDED_MODULES_LIST "")
set_property(GLOBAL PROPERTY ALL_MODULE_DOC_TARGETS "")
+set_property(GLOBAL PROPERTY EXCLUDED_MODULES_LIST "")
include(${CMAKE_SOURCE_DIR}/cmake/groups.cmake)
@@ -52,9 +53,12 @@ function(add_module_group group_modules)
foreach(module_name IN LISTS group_modules)
# Check if the module has already been added
get_property(ALREADY_ADDED GLOBAL PROPERTY ADDED_MODULES_LIST)
- if(";${ALREADY_ADDED};" MATCHES ";${module_name};")
+ if("${module_name}" IN_LIST ALREADY_ADDED)
message(
STATUS "Module ${module_name} has already been added. Skipping...")
+ elseif("${module_name}" IN_LIST EXCLUDED_MODULES_LIST)
+ message(STATUS "Module ${module_name} is excluded. Skipping...")
+ list(REMOVE_ITEM ADDED_MODULES_LIST ${module_name})
else()
# Construct the path to the module
set(module_path "${MODULES_DIR}/${module_name}")
@@ -108,28 +112,6 @@ function(add_module_group group_modules)
endforeach()
endfunction()
-list(APPEND FINAL_MODULES_LIST "")
-
-# Parse and add extra modules specified by the user
-separate_arguments(INCLUDE_MODULES_LIST UNIX_COMMAND "${INCLUDE_MODULES}")
-message(
- STATUS
- "Extra modules (if module already included already from group is ignored):
- ${INCLUDE_MODULES_LIST}")
-list(APPEND FINAL_MODULES_LIST ${INCLUDE_MODULES_LIST})
-
-# Exclude modules that were explicitly excluded by the user
-separate_arguments(EXCLUDE_MODULES_LIST UNIX_COMMAND "${EXCLUDE_MODULES}")
-message(STATUS "Excluded modules (exlcude even if in included modules):
- ${EXCLUDE_MODULES_LIST}")
-foreach(module_name IN LISTS EXCLUDE_MODULES_LIST)
- # if in list remove it and print a message
- if(";${FINAL_MODULES_LIST};" MATCHES ";${module_name};")
- list(REMOVE_ITEM FINAL_MODULES_LIST ${module_name})
- message(STATUS "Removed module: ${module_name}")
- endif()
-endforeach()
-
# Define targets before adding the groups and modules, so that we can add
# dependencies to them.
add_custom_target(
@@ -140,8 +122,19 @@ add_custom_target(
add_custom_target(kamailio_docs_man COMMENT "Generating man pages")
+# Parse and add extra modules specified by the user
+separate_arguments(INCLUDE_MODULES_LIST UNIX_COMMAND "${INCLUDE_MODULES}")
+message(
+ STATUS
+ "Extra modules (if module already included already from group is ignored):
+ ${INCLUDE_MODULES_LIST}")
+list(APPEND USER_MODULES_LIST ${INCLUDE_MODULES_LIST})
+
+separate_arguments(EXCLUDED_MODULES_LIST UNIX_COMMAND "${EXCLUDE_MODULES}")
+message(STATUS "Excluded modules (exlcude even if in included modules):
+ ${EXCLUDED_MODULES_LIST}")
+
# Add each group of modules
-add_module_group("${FINAL_MODULES_LIST}")
foreach(group IN LISTS FULL_MODULE_GROUP_NAMES)
get_property(MODULES_IN_GROUP VARIABLE PROPERTY "${group}")
if(VERBOSE)
@@ -149,10 +142,12 @@ foreach(group IN LISTS FULL_MODULE_GROUP_NAMES)
endif()
add_module_group("${MODULES_IN_GROUP}")
endforeach()
+add_module_group("${USER_MODULES_LIST}")
get_property(ADDED_MODULES_LIST GLOBAL PROPERTY ADDED_MODULES_LIST)
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})
[View Less]
<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, …
[View More]tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [x] Commit message has the format required by CONTRIBUTING guide
- [x] Commits are split per component (core, individual modules, libs, utils, ...)
- [x] Each component has a single commit (if not, squash them into one commit)
- [x] No commits to README files for modules (changes must be done to docbook files
in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change
- [x] Small bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds new functionality)
- [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [ ] Tested changes locally
- [x] Related to issue #4100
#### Description
db_schema for ims_usrloc_pcscf module
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/4108
-- Commit Summary --
* lib/srdb1/schema: ims_usrloc_pcscf definitions
* utils/kamctl: regenerate db table definitions
-- File Changes --
A src/lib/srdb1/schema/kamailio-ims_usrloc_pcscf.xml (12)
A src/lib/srdb1/schema/location_pcscf.xml (436)
A utils/kamctl/db_sqlite/ims_usrloc_pcscf-create.sql (52)
M utils/kamctl/mysql/ims_usrloc_pcscf-create.sql (99)
A utils/kamctl/oracle/ims_usrloc_pcscf-create.sql (60)
A utils/kamctl/postgres/ims_usrloc_pcscf-create.sql (52)
A utils/kamctl/xhttp_pi/ims_usrloc_pcscf-mod (167)
A utils/kamctl/xhttp_pi/ims_usrloc_pcscf-table (51)
M utils/kamctl/xhttp_pi/pi_framework.xml (218)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/4108.patchhttps://github.com/kamailio/kamailio/pull/4108.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/4108
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/4108(a)github.com>
[View Less]