2
0
Эх сурвалжийг харах

cmake: modules - coherent CMakeLists.txt style for modules

- GH #4081
Daniel-Constantin Mierla 8 сар өмнө
parent
commit
fa90e39bf3
100 өөрчлөгдсөн 327 нэмэгдсэн , 386 устгасан
  1. 2 2
      src/modules/acc/CMakeLists.txt
  2. 2 2
      src/modules/acc_diameter/CMakeLists.txt
  3. 5 4
      src/modules/acc_json/CMakeLists.txt
  4. 4 4
      src/modules/acc_radius/CMakeLists.txt
  5. 2 3
      src/modules/alias_db/CMakeLists.txt
  6. 6 5
      src/modules/app_java/CMakeLists.txt
  7. 2 3
      src/modules/app_jsdt/CMakeLists.txt
  8. 8 7
      src/modules/app_lua/CMakeLists.txt
  9. 6 5
      src/modules/app_perl/CMakeLists.txt
  10. 4 3
      src/modules/app_python/CMakeLists.txt
  11. 4 3
      src/modules/app_python3/CMakeLists.txt
  12. 4 3
      src/modules/app_python3s/CMakeLists.txt
  13. 2 5
      src/modules/app_ruby/CMakeLists.txt
  14. 5 4
      src/modules/app_ruby_proc/CMakeLists.txt
  15. 2 3
      src/modules/async/CMakeLists.txt
  16. 4 4
      src/modules/auth/CMakeLists.txt
  17. 2 3
      src/modules/auth_db/CMakeLists.txt
  18. 2 3
      src/modules/auth_diameter/CMakeLists.txt
  19. 2 3
      src/modules/auth_ephemeral/CMakeLists.txt
  20. 4 4
      src/modules/auth_radius/CMakeLists.txt
  21. 2 3
      src/modules/auth_xkeys/CMakeLists.txt
  22. 2 3
      src/modules/avp/CMakeLists.txt
  23. 2 4
      src/modules/avpops/CMakeLists.txt
  24. 2 3
      src/modules/benchmark/CMakeLists.txt
  25. 2 3
      src/modules/blst/CMakeLists.txt
  26. 2 3
      src/modules/call_control/CMakeLists.txt
  27. 2 3
      src/modules/call_obj/CMakeLists.txt
  28. 2 4
      src/modules/carrierroute/CMakeLists.txt
  29. 4 3
      src/modules/cdp/CMakeLists.txt
  30. 2 3
      src/modules/cdp_avp/CMakeLists.txt
  31. 2 4
      src/modules/cfg_db/CMakeLists.txt
  32. 2 5
      src/modules/cfg_rpc/CMakeLists.txt
  33. 2 3
      src/modules/cfgt/CMakeLists.txt
  34. 2 3
      src/modules/cfgutils/CMakeLists.txt
  35. 5 4
      src/modules/cnxcc/CMakeLists.txt
  36. 2 3
      src/modules/corex/CMakeLists.txt
  37. 2 5
      src/modules/counters/CMakeLists.txt
  38. 4 3
      src/modules/cplc/CMakeLists.txt
  39. 5 4
      src/modules/crypto/CMakeLists.txt
  40. 4 6
      src/modules/ctl/CMakeLists.txt
  41. 8 6
      src/modules/db2_ldap/CMakeLists.txt
  42. 2 4
      src/modules/db2_ops/CMakeLists.txt
  43. 5 4
      src/modules/db_berkeley/CMakeLists.txt
  44. 2 4
      src/modules/db_cluster/CMakeLists.txt
  45. 2 4
      src/modules/db_flatstore/CMakeLists.txt
  46. 5 5
      src/modules/db_mongodb/CMakeLists.txt
  47. 6 6
      src/modules/db_mysql/CMakeLists.txt
  48. 7 8
      src/modules/db_oracle/CMakeLists.txt
  49. 7 6
      src/modules/db_perlvdb/CMakeLists.txt
  50. 6 6
      src/modules/db_postgres/CMakeLists.txt
  51. 5 5
      src/modules/db_redis/CMakeLists.txt
  52. 4 3
      src/modules/db_sqlite/CMakeLists.txt
  53. 2 3
      src/modules/db_text/CMakeLists.txt
  54. 6 5
      src/modules/db_unixodbc/CMakeLists.txt
  55. 2 3
      src/modules/debugger/CMakeLists.txt
  56. 2 4
      src/modules/dialog/CMakeLists.txt
  57. 2 4
      src/modules/dialplan/CMakeLists.txt
  58. 2 4
      src/modules/dispatcher/CMakeLists.txt
  59. 2 3
      src/modules/diversion/CMakeLists.txt
  60. 2 3
      src/modules/dlgs/CMakeLists.txt
  61. 2 4
      src/modules/dmq/CMakeLists.txt
  62. 2 3
      src/modules/dmq_usrloc/CMakeLists.txt
  63. 5 7
      src/modules/dnssec/CMakeLists.txt
  64. 2 4
      src/modules/domain/CMakeLists.txt
  65. 2 4
      src/modules/domainpolicy/CMakeLists.txt
  66. 2 4
      src/modules/drouting/CMakeLists.txt
  67. 2 3
      src/modules/enum/CMakeLists.txt
  68. 5 4
      src/modules/erlang/CMakeLists.txt
  69. 5 4
      src/modules/evapi/CMakeLists.txt
  70. 2 3
      src/modules/evrexec/CMakeLists.txt
  71. 2 3
      src/modules/exec/CMakeLists.txt
  72. 2 3
      src/modules/file_out/CMakeLists.txt
  73. 5 4
      src/modules/gcrypt/CMakeLists.txt
  74. 5 4
      src/modules/geoip/CMakeLists.txt
  75. 5 5
      src/modules/geoip2/CMakeLists.txt
  76. 2 4
      src/modules/group/CMakeLists.txt
  77. 4 3
      src/modules/gzcompress/CMakeLists.txt
  78. 2 3
      src/modules/h350/CMakeLists.txt
  79. 2 4
      src/modules/htable/CMakeLists.txt
  80. 4 3
      src/modules/http_async_client/CMakeLists.txt
  81. 5 4
      src/modules/http_client/CMakeLists.txt
  82. 2 4
      src/modules/imc/CMakeLists.txt
  83. 5 4
      src/modules/ims_auth/CMakeLists.txt
  84. 2 4
      src/modules/ims_charging/CMakeLists.txt
  85. 2 4
      src/modules/ims_dialog/CMakeLists.txt
  86. 2 4
      src/modules/ims_diameter_server/CMakeLists.txt
  87. 4 4
      src/modules/ims_icscf/CMakeLists.txt
  88. 5 5
      src/modules/ims_ipsec_pcscf/CMakeLists.txt
  89. 5 4
      src/modules/ims_isc/CMakeLists.txt
  90. 2 4
      src/modules/ims_ocs/CMakeLists.txt
  91. 2 4
      src/modules/ims_qos/CMakeLists.txt
  92. 2 4
      src/modules/ims_qos_npn/CMakeLists.txt
  93. 4 3
      src/modules/ims_registrar_pcscf/CMakeLists.txt
  94. 4 3
      src/modules/ims_registrar_scscf/CMakeLists.txt
  95. 2 4
      src/modules/ims_usrloc_pcscf/CMakeLists.txt
  96. 2 4
      src/modules/ims_usrloc_scscf/CMakeLists.txt
  97. 2 3
      src/modules/influxdbc/CMakeLists.txt
  98. 2 3
      src/modules/ipops/CMakeLists.txt
  99. 4 3
      src/modules/jansson/CMakeLists.txt
  100. 4 3
      src/modules/janssonrpcc/CMakeLists.txt

+ 2 - 2
src/modules/acc/CMakeLists.txt

@@ -1,3 +1,3 @@
-file(GLOB acc_SRC "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(acc SHARED ${acc_SRC})
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 2
src/modules/acc_diameter/CMakeLists.txt

@@ -1,3 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(acc_diameter SHARED ${SRC_FILES})
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 5 - 4
src/modules/acc_json/CMakeLists.txt

@@ -1,8 +1,9 @@
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
+
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(JANSSON REQUIRED IMPORTED_TARGET jansson)
 add_library(jansson::jansson ALIAS PkgConfig::JANSSON)
 
-file(GLOB SRC_FILES "*.c")
-
-add_library(acc_json SHARED ${SRC_FILES})
-target_link_libraries(acc_json PRIVATE jansson::jansson)
+target_link_libraries(${module_name} PRIVATE jansson::jansson)

+ 4 - 4
src/modules/acc_radius/CMakeLists.txt

@@ -1,7 +1,7 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(Radius REQUIRED)
 
-add_library(acc_radius SHARED ${SRC_FILES})
-target_compile_definitions(acc_radius PRIVATE ${RADIUSCLIENT_LIB})
-# target_link_libraries(.*PRIVATE)
+target_compile_definitions(${module_name} PRIVATE ${RADIUSCLIENT_LIB})

+ 2 - 3
src/modules/alias_db/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(alias_db SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 6 - 5
src/modules/app_java/CMakeLists.txt

@@ -1,10 +1,11 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 # TODO: GCJ is a discontiuned project from 2018 sudo apt install openjdk-13-jdk
 # compiles with warnings
 find_package(JNI REQUIRED)
 
-add_library(app_java SHARED ${SRC_FILES})
-target_compile_options(app_java PRIVATE -O0 -g)
-target_include_directories(app_java PRIVATE JNI_INCLUDE_DIRS)
-target_link_libraries(app_java PRIVATE JNI::JNI)
+target_compile_options(${module_name} PRIVATE -O0 -g)
+target_include_directories(${module_name} PRIVATE JNI_INCLUDE_DIRS)
+target_link_libraries(${module_name} PRIVATE JNI::JNI)

+ 2 - 3
src/modules/app_jsdt/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(app_jsdt SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 8 - 7
src/modules/app_lua/CMakeLists.txt

@@ -1,4 +1,6 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 option(LUAJIT "Enable LuaJIT (for app_lua modules)" OFF)
 
@@ -11,9 +13,8 @@ else()
   set(LUA_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
 endif()
 
-add_library(app_lua SHARED ${SRC_FILES})
-# the LUA_COMPAT_MODULE fixes this error: implicit declaration of function
-# ‘luaL_openlib
-target_compile_definitions(app_lua PRIVATE LUA_COMPAT_MODULE)
-target_include_directories(app_lua PRIVATE ${LUA_INCLUDE_DIRS})
-target_link_libraries(app_lua PRIVATE ${LUA_LIBRARIES})
+# the LUA_COMPAT_MODULE fixes this error: - implicit declaration of function
+# luaL_openlib
+target_compile_definitions(${module_name} PRIVATE LUA_COMPAT_MODULE)
+target_include_directories(${module_name} PRIVATE ${LUA_INCLUDE_DIRS})
+target_link_libraries(${module_name} PRIVATE ${LUA_LIBRARIES})

+ 6 - 5
src/modules/app_perl/CMakeLists.txt

@@ -1,10 +1,11 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 # libperl-dev
 find_package(PerlLibs REQUIRED)
 
-add_library(app_perl SHARED ${SRC_FILES})
-target_include_directories(app_perl PRIVATE ${PERL_INCLUDE_PATH})
+target_include_directories(${module_name} PRIVATE ${PERL_INCLUDE_PATH})
 # message(STATUS "PERL_EXTRA_C_FLAGS: ${PERL_EXTRA_C_FLAGS}")
-target_compile_definitions(app_perl PRIVATE ${PERL_EXTRA_C_FLAGS})
-target_link_libraries(app_perl PRIVATE ${PERL_LIBRARY})
+target_compile_definitions(${module_name} PRIVATE ${PERL_EXTRA_C_FLAGS})
+target_link_libraries(${module_name} PRIVATE ${PERL_LIBRARY})

+ 4 - 3
src/modules/app_python/CMakeLists.txt

@@ -1,7 +1,8 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 # python2-dev package is required for Python2::Module target
 find_package(Python2 REQUIRED COMPONENTS Development)
 
-add_library(app_python SHARED ${SRC_FILES})
-target_link_libraries(app_python PRIVATE Python2::Module)
+target_link_libraries(${module_name} PRIVATE Python2::Module)

+ 4 - 3
src/modules/app_python3/CMakeLists.txt

@@ -1,6 +1,7 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(Python3 REQUIRED COMPONENTS Development)
 
-add_library(app_python3 SHARED ${SRC_FILES})
-target_link_libraries(app_python3 PRIVATE Python3::Python)
+target_link_libraries(${module_name} PRIVATE Python3::Python)

+ 4 - 3
src/modules/app_python3s/CMakeLists.txt

@@ -1,6 +1,7 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(Python3 REQUIRED COMPONENTS Development)
 
-add_library(app_python3s STATIC ${SRC_FILES})
-target_link_libraries(app_python3s PRIVATE Python3::Module)
+target_link_libraries(${module_name} PRIVATE Python3::Module)

+ 2 - 5
src/modules/app_ruby/CMakeLists.txt

@@ -1,6 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-find_package(Ruby REQUIRED)
-
-add_library(app_ruby SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 5 - 4
src/modules/app_ruby_proc/CMakeLists.txt

@@ -1,8 +1,9 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 # ruby-dev package
 find_package(Ruby REQUIRED)
-add_library(app_ruby_proc SHARED ${SRC_FILES})
 
-target_include_directories(app_ruby_proc PRIVATE ${Ruby_INCLUDE_DIRS})
-target_link_libraries(app_ruby_proc PRIVATE ${Ruby_LIBRARIES})
+target_include_directories(${module_name} PRIVATE ${Ruby_INCLUDE_DIRS})
+target_link_libraries(${module_name} PRIVATE ${Ruby_LIBRARIES})

+ 2 - 3
src/modules/async/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(async SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 4 - 4
src/modules/auth/CMakeLists.txt

@@ -1,5 +1,5 @@
-file(GLOB auth_SRC "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(auth SHARED ${auth_SRC})
-# target_link_libraries(.*PRIVATE)
-target_compile_definitions(auth PRIVATE USE_NC USE_OT_NONCE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})
+
+target_compile_definitions(${module_name} PRIVATE USE_NC USE_OT_NONCE)

+ 2 - 3
src/modules/auth_db/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(auth_db SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/auth_diameter/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(auth_diameter SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/auth_ephemeral/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(auth_ephemeral SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 4 - 4
src/modules/auth_radius/CMakeLists.txt

@@ -1,7 +1,7 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(Radius REQUIRED)
 
-add_library(auth_radius SHARED ${SRC_FILES})
-target_compile_definitions(auth_radius PRIVATE ${RADIUSCLIENT_LIB})
-# target_link_libraries(.*PRIVATE)
+target_compile_definitions(${module_name} PRIVATE ${RADIUSCLIENT_LIB})

+ 2 - 3
src/modules/auth_xkeys/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(auth_xkeys SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/avp/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(avp SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 4
src/modules/avpops/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(avpops SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/benchmark/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(benchmark SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/blst/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(blst SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/call_control/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(call_control SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/call_obj/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(call_obj SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 4
src/modules/carrierroute/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(carrierroute SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 4 - 3
src/modules/cdp/CMakeLists.txt

@@ -1,6 +1,7 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(LibXml2 REQUIRED)
 
-add_library(cdp SHARED ${SRC_FILES})
-target_link_libraries(cdp PRIVATE LibXml2::LibXml2)
+target_link_libraries(${module_name} PRIVATE LibXml2::LibXml2)

+ 2 - 3
src/modules/cdp_avp/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(cdp_avp SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 4
src/modules/cfg_db/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(cfg_db SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 5
src/modules/cfg_rpc/CMakeLists.txt

@@ -1,6 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(cfg_rpc SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
-
-# TODO: Also install kamcmd binary
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/cfgt/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(cfgt SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/cfgutils/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(cfgutils SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 5 - 4
src/modules/cnxcc/CMakeLists.txt

@@ -1,3 +1,7 @@
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
+
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(redis REQUIRED IMPORTED_TARGET hiredis)
 add_library(redis::redis ALIAS PkgConfig::redis)
@@ -6,7 +10,4 @@ find_package(PkgConfig REQUIRED)
 pkg_check_modules(EVENT REQUIRED IMPORTED_TARGET libevent)
 add_library(event::event ALIAS PkgConfig::EVENT)
 
-file(GLOB SRC_FILES "*.c")
-
-add_library(cnxcc SHARED ${SRC_FILES})
-target_link_libraries(cnxcc PRIVATE redis::redis event::event)
+target_link_libraries(${module_name} PRIVATE redis::redis event::event)

+ 2 - 3
src/modules/corex/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(corex SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 5
src/modules/counters/CMakeLists.txt

@@ -1,6 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(counters SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
-
-# TODO: Also install kamcmd binary
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 4 - 3
src/modules/cplc/CMakeLists.txt

@@ -1,6 +1,7 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(LibXml2 REQUIRED)
 
-add_library(cplc SHARED ${SRC_FILES})
-target_link_libraries(cplc PRIVATE LibXml2::LibXml2)
+target_link_libraries(${module_name} PRIVATE LibXml2::LibXml2)

+ 5 - 4
src/modules/crypto/CMakeLists.txt

@@ -1,6 +1,7 @@
-find_package(OpenSSL REQUIRED COMPONENTS SSL Crypto)
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
-file(GLOB SRC_FILES "*.c")
+find_package(OpenSSL REQUIRED COMPONENTS SSL Crypto)
 
-add_library(crypto SHARED ${SRC_FILES})
-target_link_libraries(crypto PRIVATE OpenSSL::SSL OpenSSL::Crypto)
+target_link_libraries(${module_name} PRIVATE OpenSSL::SSL OpenSSL::Crypto)

+ 4 - 6
src/modules/ctl/CMakeLists.txt

@@ -1,8 +1,6 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(ctl SHARED ${SRC_FILES})
-# TODO: Should this be picked by user defined or hardcoded?
-target_compile_definitions(ctl PRIVATE USE_FIFO CTL_SYSTEM_MALLOC)
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
-# TODO: Also install kamcmd binary
+# TODO: Should this be picked by user defined or hardcoded?
+target_compile_definitions(${module_name} PRIVATE USE_FIFO CTL_SYSTEM_MALLOC)

+ 8 - 6
src/modules/db2_ldap/CMakeLists.txt

@@ -1,3 +1,7 @@
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
+
 # libsasl2-dev is required for LDAP support
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(libsasl2 REQUIRED IMPORTED_TARGET libsasl2)
@@ -6,10 +10,8 @@ add_library(libsasl2::libsasl2 ALIAS PkgConfig::libsasl2)
 # libldap-2.4-2 is required for LDAP support
 find_package(Ldap REQUIRED)
 
-file(GLOB SRC_FILES "*.c")
-
-add_library(db2_ldap SHARED ${SRC_FILES})
 # LDAP_DEPRECATED is required for LDAP support else it will throw compile error
-target_compile_definitions(db2_ldap PRIVATE LDAP_DEPRECATED)
-target_include_directories(db2_ldap PRIVATE ${Ldap_INCLUDE_DIRS})
-target_link_libraries(db2_ldap PRIVATE ${LDAP_LIBRARIES} libsasl2::libsasl2)
+target_compile_definitions(${module_name} PRIVATE LDAP_DEPRECATED)
+target_include_directories(${module_name} PRIVATE ${Ldap_INCLUDE_DIRS})
+target_link_libraries(${module_name} PRIVATE ${LDAP_LIBRARIES}
+                                             libsasl2::libsasl2)

+ 2 - 4
src/modules/db2_ops/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(db2_ops SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 5 - 4
src/modules/db_berkeley/CMakeLists.txt

@@ -1,7 +1,8 @@
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
+
 # libdb++-dev
 find_package(BerkeleyDB REQUIRED)
 
-file(GLOB SRC_FILES "*.c")
-
-add_library(db_berkeley SHARED ${SRC_FILES})
-target_link_libraries(db_berkeley PRIVATE BerkeleyDB::BerkeleyDB)
+target_link_libraries(${module_name} PRIVATE BerkeleyDB::BerkeleyDB)

+ 2 - 4
src/modules/db_cluster/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(db_cluster SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 4
src/modules/db_flatstore/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(db_flatstore SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 5 - 5
src/modules/db_mongodb/CMakeLists.txt

@@ -1,11 +1,11 @@
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
+
 # libmongoc-1.0 is required for this module Missing dependency on Ubuntu 20.04
 # of libzstd-dev find_package(zstd REQUIRED)
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(mongoc REQUIRED IMPORTED_TARGET libmongoc-1.0>=1.7)
 add_library(mongoc::mongoc ALIAS PkgConfig::mongoc)
 
-file(GLOB SRC_FILES "*.c")
-
-add_library(db_mongodb SHARED ${SRC_FILES})
-
-target_link_libraries(db_mongodb PRIVATE mongoc::mongoc)
+target_link_libraries(${module_name} PRIVATE mongoc::mongoc)

+ 6 - 6
src/modules/db_mysql/CMakeLists.txt

@@ -1,3 +1,7 @@
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
+
 find_package(MariaDBClient REQUIRED)
 
 if(NOT MariaDBClient_FOUND)
@@ -5,11 +9,7 @@ if(NOT MariaDBClient_FOUND)
   message(FATAL_ERROR "Please install the dev libraries")
 endif()
 
-file(GLOB mySQL_SRC "*.c")
-
-add_library(db_mysql SHARED ${mySQL_SRC})
-
-target_include_directories(db_mysql PRIVATE ${MariaDBClient_INCLUDE_DIRS})
-target_link_libraries(db_mysql PRIVATE ${MariaDBClient_LIBRARIES})
+target_include_directories(${module_name} PRIVATE ${MariaDBClient_INCLUDE_DIRS})
+target_link_libraries(${module_name} PRIVATE ${MariaDBClient_LIBRARIES})
 
 # TODO Install script files for kamctl

+ 7 - 8
src/modules/db_oracle/CMakeLists.txt

@@ -1,11 +1,10 @@
-# TODO: Needs some testing for OS that support OracleDB
-find_package(Oracle REQUIRED)
+file(GLOB MODULE_SOURCES "*.c")
 
-file(GLOB SRC_FILES "*.c")
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
-add_library(db_oracle SHARED ${SRC_FILES})
-target_include_directories(db_oracle PRIVATE ${Oracle_INCLUDE_DIRS}
-)# /usr/include/oracle/18.3/client64)
-target_link_libraries(db_oracle PRIVATE occi clntsh)
+# TODO: Needs some testing for OS that support OracleDB
+find_package(Oracle REQUIRED)
 
-# target_link_libraries(.*PRIVATE)
+# /usr/include/oracle/18.3/client64)
+target_include_directories(${module_name} PRIVATE ${Oracle_INCLUDE_DIRS})
+target_link_libraries(${module_name} PRIVATE occi clntsh)

+ 7 - 6
src/modules/db_perlvdb/CMakeLists.txt

@@ -1,8 +1,9 @@
-find_package(PerlLibs REQUIRED)
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
-file(GLOB SRC_FILES "*.c")
+find_package(PerlLibs REQUIRED)
 
-add_library(db_perlvdb SHARED ${SRC_FILES})
-target_include_directories(db_perlvdb PRIVATE ${PERL_INCLUDE_PATH})
-target_compile_definitions(db_perlvdb PRIVATE ${PERL_EXTRA_C_FLAGS})
-target_link_libraries(db_perlvdb PRIVATE ${PERL_LIBRARY})
+target_include_directories(${module_name} PRIVATE ${PERL_INCLUDE_PATH})
+target_compile_definitions(${module_name} PRIVATE ${PERL_EXTRA_C_FLAGS})
+target_link_libraries(${module_name} PRIVATE ${PERL_LIBRARY})

+ 6 - 6
src/modules/db_postgres/CMakeLists.txt

@@ -1,9 +1,9 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-find_package(PostgreSQL REQUIRED)
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
-add_library(db_postgres SHARED ${SRC_FILES})
+find_package(PostgreSQL REQUIRED)
 
-target_compile_definitions(db_postgres PRIVATE ${PostgreSQL_DEFINITIONS})
-target_include_directories(db_postgres PRIVATE ${PostgreSQL_INCLUDE_DIRS})
-target_link_libraries(db_postgres PRIVATE ${PostgreSQL_LIBRARIES})
+target_compile_definitions(${module_name} PRIVATE ${PostgreSQL_DEFINITIONS})
+target_include_directories(${module_name} PRIVATE ${PostgreSQL_INCLUDE_DIRS})
+target_link_libraries(${module_name} PRIVATE ${PostgreSQL_LIBRARIES})

+ 5 - 5
src/modules/db_redis/CMakeLists.txt

@@ -1,11 +1,11 @@
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
+
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(redis REQUIRED IMPORTED_TARGET hiredis)
 add_library(redis::redis ALIAS PkgConfig::redis)
 
-file(GLOB SRC_FILES "*.c")
-
 # TODO: Check with Makefile for cluster stuff
 
-add_library(db_redis SHARED ${SRC_FILES})
-
-target_link_libraries(db_redis PRIVATE redis::redis)
+target_link_libraries(${module_name} PRIVATE redis::redis)

+ 4 - 3
src/modules/db_sqlite/CMakeLists.txt

@@ -1,6 +1,7 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(SQLite3 REQUIRED)
 
-add_library(db_sqlite SHARED ${SRC_FILES})
-target_link_libraries(db_sqlite PRIVATE SQLite::SQLite3)
+target_link_libraries(${module_name} PRIVATE SQLite::SQLite3)

+ 2 - 3
src/modules/db_text/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(db_text SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 6 - 5
src/modules/db_unixodbc/CMakeLists.txt

@@ -1,7 +1,8 @@
-find_package(ODBC REQUIRED)
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
-file(GLOB SRC_FILES "*.c")
+find_package(ODBC REQUIRED)
 
-add_library(db_unixodbc SHARED ${SRC_FILES})
-target_include_directories(db_unixodbc PRIVATE ${ODBC_INCLUDE_DIRS})
-target_link_libraries(db_unixodbc PRIVATE ${ODBC_LIBRARIES})
+target_include_directories(${module_name} PRIVATE ${ODBC_INCLUDE_DIRS})
+target_link_libraries(${module_name} PRIVATE ${ODBC_LIBRARIES})

+ 2 - 3
src/modules/debugger/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(debugger SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 4
src/modules/dialog/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(dialog SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 4
src/modules/dialplan/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(dialplan SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 4
src/modules/dispatcher/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(dispatcher SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/diversion/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(diversion SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/dlgs/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(dlgs SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 4
src/modules/dmq/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(dmq SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/dmq_usrloc/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(dmq_usrloc SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 5 - 7
src/modules/dnssec/CMakeLists.txt

@@ -1,13 +1,11 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(OpenSSL REQUIRED COMPONENTS SSL Crypto)
 find_package(Threads REQUIRED)
 
-add_library(dnssec SHARED ${SRC_FILES})
-
 # TODO: library libval not foud on recent distributions: whichi library is sres?
 # Consider depreciating this module?
-target_link_libraries(dnssec PRIVATE val-threads sres Threads::Threads
-                                     OpenSSL::SSL OpenSSL::Crypto)
-
-# target_link_libraries(.*PRIVATE)
+target_link_libraries(${module_name} PRIVATE val-threads sres Threads::Threads
+                                             OpenSSL::SSL OpenSSL::Crypto)

+ 2 - 4
src/modules/domain/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(domain SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 4
src/modules/domainpolicy/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(domainpolicy SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 4
src/modules/drouting/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(drouting SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/enum/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(enum SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 5 - 4
src/modules/erlang/CMakeLists.txt

@@ -1,7 +1,8 @@
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
+
 # erlang-dev
 find_package(Erlang REQUIRED)
 
-file(GLOB SRC_FILES "*.c")
-
-add_library(erlang SHARED ${SRC_FILES})
-target_link_libraries(erlang PRIVATE Erlang::EI)
+target_link_libraries(${module_name} PRIVATE Erlang::EI)

+ 5 - 4
src/modules/evapi/CMakeLists.txt

@@ -1,6 +1,7 @@
-find_package(Libev REQUIRED)
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
-file(GLOB SRC_FILES "*.c")
+find_package(Libev REQUIRED)
 
-add_library(evapi SHARED ${SRC_FILES})
-target_link_libraries(evapi PRIVATE Libev::Libev)
+target_link_libraries(${module_name} PRIVATE Libev::Libev)

+ 2 - 3
src/modules/evrexec/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(evrexec SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/exec/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(exec SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/file_out/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(file_out SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 5 - 4
src/modules/gcrypt/CMakeLists.txt

@@ -1,8 +1,9 @@
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
+
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(gcrypt REQUIRED IMPORTED_TARGET libgcrypt)
 add_library(gcrypt::gcrypt ALIAS PkgConfig::gcrypt)
 
-file(GLOB SRC_FILES "*.c")
-
-add_library(gcrypt SHARED ${SRC_FILES})
-target_link_libraries(gcrypt PRIVATE gcrypt::gcrypt)
+target_link_libraries(${module_name} PRIVATE gcrypt::gcrypt)

+ 5 - 4
src/modules/geoip/CMakeLists.txt

@@ -1,8 +1,9 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(geoip REQUIRED IMPORTED_TARGET geoip)
 
-add_library(geoip SHARED ${SRC_FILES})
-target_include_directories(geoip PRIVATE ${geoip_INCLUDE_DIRS})
-target_link_libraries(geoip PRIVATE ${geoip_LIBRARIES})
+target_include_directories(${module_name} PRIVATE ${geoip_INCLUDE_DIRS})
+target_link_libraries(${module_name} PRIVATE ${geoip_LIBRARIES})

+ 5 - 5
src/modules/geoip2/CMakeLists.txt

@@ -1,9 +1,9 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(geoip2 REQUIRED IMPORTED_TARGET libmaxminddb)
 
-add_library(geoip2 SHARED ${SRC_FILES})
-
-target_include_directories(geoip2 PRIVATE ${geoip2_INCLUDE_DIRS})
-target_link_libraries(geoip2 PRIVATE ${geip2_LIBRARIES})
+target_include_directories(${module_name} PRIVATE ${geoip2_INCLUDE_DIRS})
+target_link_libraries(${module_name} PRIVATE ${geip2_LIBRARIES})

+ 2 - 4
src/modules/group/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(group SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 4 - 3
src/modules/gzcompress/CMakeLists.txt

@@ -1,8 +1,9 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(zlib REQUIRED IMPORTED_TARGET zlib)
 add_library(zlib::zlib ALIAS PkgConfig::zlib)
 
-add_library(gzcompress SHARED ${SRC_FILES})
-target_link_libraries(gzcompress PRIVATE zlib::zlib)
+target_link_libraries(${module_name} PRIVATE zlib::zlib)

+ 2 - 3
src/modules/h350/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(h350 SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 4
src/modules/htable/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(htable SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 4 - 3
src/modules/http_async_client/CMakeLists.txt

@@ -1,4 +1,6 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(CURL REQUIRED)
 
@@ -6,5 +8,4 @@ find_package(PkgConfig REQUIRED)
 pkg_check_modules(EVENT REQUIRED IMPORTED_TARGET libevent)
 add_library(event::event ALIAS PkgConfig::EVENT)
 
-add_library(http_async_client SHARED ${SRC_FILES})
-target_link_libraries(http_async_client PRIVATE CURL::libcurl event::event)
+target_link_libraries(${module_name} PRIVATE CURL::libcurl event::event)

+ 5 - 4
src/modules/http_client/CMakeLists.txt

@@ -1,6 +1,7 @@
-find_package(CURL REQUIRED)
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
-file(GLOB SRC_FILES "*.c")
+find_package(CURL REQUIRED)
 
-add_library(http_client SHARED ${SRC_FILES})
-target_link_libraries(http_client PRIVATE CURL::libcurl)
+target_link_libraries(${module_name} PRIVATE CURL::libcurl)

+ 2 - 4
src/modules/imc/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(imc SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 5 - 4
src/modules/ims_auth/CMakeLists.txt

@@ -1,6 +1,7 @@
-find_package(LibXml2 REQUIRED)
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
-file(GLOB SRC_FILES "*.c")
+find_package(LibXml2 REQUIRED)
 
-add_library(ims_auth SHARED ${SRC_FILES})
-target_link_libraries(ims_auth PRIVATE LibXml2::LibXml2)
+target_link_libraries(${module_name} PRIVATE LibXml2::LibXml2)

+ 2 - 4
src/modules/ims_charging/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(ims_charging SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 4
src/modules/ims_dialog/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(ims_dialog SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 4
src/modules/ims_diameter_server/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(ims_diameter_server SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 4 - 4
src/modules/ims_icscf/CMakeLists.txt

@@ -1,7 +1,7 @@
-find_package(LibXml2 REQUIRED)
+file(GLOB MODULE_SOURCES "*.c")
 
-file(GLOB SRC_FILES "*.c")
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
-add_library(ims_icscf SHARED ${SRC_FILES})
+find_package(LibXml2 REQUIRED)
 
-target_link_libraries(ims_icscf PRIVATE LibXml2::LibXml2)
+target_link_libraries(${module_name} PRIVATE LibXml2::LibXml2)

+ 5 - 5
src/modules/ims_ipsec_pcscf/CMakeLists.txt

@@ -1,9 +1,9 @@
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
+
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(libmnl REQUIRED IMPORTED_TARGET libmnl)
 add_library(libmnl::libmnl ALIAS PkgConfig::libmnl)
 
-file(GLOB SRC_FILES "*.c")
-
-add_library(ims_ipsec_pcscf SHARED ${SRC_FILES})
-
-target_link_libraries(ims_ipsec_pcscf PRIVATE libmnl::libmnl)
+target_link_libraries(${module_name} PRIVATE libmnl::libmnl)

+ 5 - 4
src/modules/ims_isc/CMakeLists.txt

@@ -1,6 +1,7 @@
-find_package(LibXml2 REQUIRED)
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
-file(GLOB SRC_FILES "*.c")
+find_package(LibXml2 REQUIRED)
 
-add_library(ims_isc SHARED ${SRC_FILES})
-target_link_libraries(ims_isc PRIVATE LibXml2::LibXml2)
+target_link_libraries(${module_name} PRIVATE LibXml2::LibXml2)

+ 2 - 4
src/modules/ims_ocs/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(ims_ocs SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 4
src/modules/ims_qos/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(ims_qos SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 4
src/modules/ims_qos_npn/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(osp SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 4 - 3
src/modules/ims_registrar_pcscf/CMakeLists.txt

@@ -1,6 +1,7 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(LibXml2 REQUIRED)
 
-add_library(ims_registrar_pcscf SHARED ${SRC_FILES})
-target_link_libraries(ims_registrar_pcscf PRIVATE LibXml2::LibXml2)
+target_link_libraries(${module_name} PRIVATE LibXml2::LibXml2)

+ 4 - 3
src/modules/ims_registrar_scscf/CMakeLists.txt

@@ -1,6 +1,7 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(LibXml2 REQUIRED)
 
-add_library(ims_registrar_scscf SHARED ${SRC_FILES})
-target_link_libraries(ims_registrar_scscf PRIVATE LibXml2::LibXml2)
+target_link_libraries(${module_name} PRIVATE LibXml2::LibXml2)

+ 2 - 4
src/modules/ims_usrloc_pcscf/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(ims_usrloc_pcscf SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 4
src/modules/ims_usrloc_scscf/CMakeLists.txt

@@ -1,5 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(ims_usrloc_scscf SHARED ${SRC_FILES})
-
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/influxdbc/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(influxdbc SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 2 - 3
src/modules/ipops/CMakeLists.txt

@@ -1,4 +1,3 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
 
-add_library(ipops SHARED ${SRC_FILES})
-# target_link_libraries(.*PRIVATE)
+add_library(${module_name} SHARED ${MODULE_SOURCES})

+ 4 - 3
src/modules/jansson/CMakeLists.txt

@@ -1,8 +1,9 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(JANSSON REQUIRED IMPORTED_TARGET jansson)
 add_library(jansson::jansson ALIAS PkgConfig::JANSSON)
 
-add_library(jansson SHARED ${SRC_FILES})
-target_link_libraries(jansson PRIVATE jansson::jansson)
+target_link_libraries(${module_name} PRIVATE jansson::jansson)

+ 4 - 3
src/modules/janssonrpcc/CMakeLists.txt

@@ -1,4 +1,6 @@
-file(GLOB SRC_FILES "*.c")
+file(GLOB MODULE_SOURCES "*.c")
+
+add_library(${module_name} SHARED ${MODULE_SOURCES})
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(JANSSON REQUIRED IMPORTED_TARGET jansson)
@@ -8,5 +10,4 @@ find_package(PkgConfig REQUIRED)
 pkg_check_modules(EVENT REQUIRED IMPORTED_TARGET libevent)
 add_library(event::event ALIAS PkgConfig::EVENT)
 
-add_library(janssonrpcc SHARED ${SRC_FILES})
-target_link_libraries(janssonrpcc PRIVATE jansson::jansson event::event)
+target_link_libraries(${module_name} PRIVATE jansson::jansson event::event)

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно