[sr-dev] git:master:6839f1a2: cmake/kamctl: Build and install to correct paths

Module: kamailio Branch: master Commit: 6839f1a2e090f06b0b7ca9289dd3b7279903a1e2 URL: https://github.com/kamailio/kamailio/commit/6839f1a2e090f06b0b7ca9289dd3b72… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-15T14:42:31Z cmake/kamctl: Build and install to correct paths - Some filebased databases require the kamailio subfolder --- Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/6839f1a2e090f06b0b7ca9289dd3b72… Patch: https://github.com/kamailio/kamailio/commit/6839f1a2e090f06b0b7ca9289dd3b72… --- diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index 215399be4ae..c5eb602a18a 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -274,8 +274,10 @@ else() OR db_name STREQUAL "dbtext" OR db_name STREQUAL "mongodb") set(prefix '') + set(folder_suffix "${MAIN_NAME}") else() set(prefix "${table}-") + set(folder_suffix '') endif() add_custom_command( @@ -283,7 +285,8 @@ else() PRE_BUILD COMMAND XML_CATALOG_FILES=${CATALOG} ${XSLTPROC_EXECUTABLE} ${XSLTPROC_FLAGS} - --stringparam dir ${CMAKE_CURRENT_BINARY_DIR}/${db_name_folder} + --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"