Module: kamailio Branch: master Commit: 78dbbda4ca74e18c4a99c87520abd5d7906af4d3 URL: https://github.com/kamailio/kamailio/commit/78dbbda4ca74e18c4a99c87520abd5d7...
Author: Xenofon Karamanos xk@gilawa.com Committer: Xenofon Karamanos xk@gilawa.com Date: 2025-07-24T13:11:45Z
cmake: Fix help string and allow mutliple values from gui
- Allow providing multiple space seperated groups in guis like ccmake instead of the single option
- ALL_PACKAGED option refined to be allowed with other groups as well. - Providing ALL_PACKAGED with another group will append the another group to the list of groups comprising the ALL_PACKAGED option. - Remove duplicates in the group list if any
---
Modified: src/modules/CMakeLists.txt
---
Diff: https://github.com/kamailio/kamailio/commit/78dbbda4ca74e18c4a99c87520abd5d7... Patch: https://github.com/kamailio/kamailio/commit/78dbbda4ca74e18c4a99c87520abd5d7...
---
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 32840740a92..18dd8fe094c 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -12,16 +12,21 @@ include(${CMAKE_SOURCE_DIR}/cmake/groups.cmake) set(AVAILABLE_GROUP_NAMES ${AVAILABLE_GROUPS}) set(MODULE_GROUP_NAME "DEFAULT" - CACHE STRING "Group of modules to build (one or multiple space seperated group)" + CACHE STRING "Groups of modules to build (one or multiple space seperated group)" ) -set_property(CACHE MODULE_GROUP_NAME PROPERTY STRINGS ${AVAILABLE_GROUP_NAMES})
# User may provide multiple groups seperated by space -if(MODULE_GROUP_NAME STREQUAL "ALL_PACKAGED") - set(MODULE_GROUP_LIST ${MODULE_GROUP_PACKAGE_GROUPS}) -else() - separate_arguments(MODULE_GROUP_LIST UNIX_COMMAND "${MODULE_GROUP_NAME}") - message(STATUS "Building groups: ${MODULE_GROUP_LIST}") +separate_arguments(MODULE_GROUP_LIST UNIX_COMMAND "${MODULE_GROUP_NAME}") + +# Deduplicate the list +list(REMOVE_DUPLICATES MODULE_GROUP_LIST) +list(FIND MODULE_GROUP_LIST "ALL_PACKAGED" INDEX) + +if(INDEX GREATER -1) + # Remove it from the lists + list(REMOVE_AT MODULE_GROUP_LIST ${INDEX}) + list(APPEND MODULE_GROUP_LIST ${MODULE_GROUP_PACKAGE_GROUPS}) + message(STATUS "Building all packaged modules along with other provided groups.") endif()
# Check if elements in MODULE_GROUP_LIST are valid by checking against @@ -40,6 +45,7 @@ foreach(group_name IN LISTS MODULE_GROUP_LIST) # message(STATUS "Modules: ${MODULE_GROUP}") endif() endforeach() +message(STATUS "Building groups: ${MODULE_GROUP_LIST}") # message(STATUS "Expanded module groups: ${FULL_MODULE_GROUP_NAMES}")
# Allow users to specify extra modules to build
-
Xenofon Karamanos