소스 검색

cmake: rename files to use - instead of _ in the name

- have a coherent naming style, most were with -
Daniel-Constantin Mierla 7 달 전
부모
커밋
19625af3f3
4개의 변경된 파일25개의 추가작업 그리고 41개의 파일을 삭제
  1. 5 9
      CMakeLists.txt
  2. 0 0
      cmake/cmake-uninstall.cmake.in
  3. 0 0
      cmake/modules-docs.cmake
  4. 20 32
      src/modules/CMakeLists.txt

+ 5 - 9
CMakeLists.txt

@@ -32,13 +32,11 @@ include(${CMAKE_SOURCE_DIR}/cmake/BuildType.cmake)
 # main binary name
 # main binary name
 set(MAIN_NAME
 set(MAIN_NAME
     "kamailio"
     "kamailio"
-    CACHE STRING "Main binary name"
-)
+    CACHE STRING "Main binary name")
 # use kamailio config
 # use kamailio config
 set(CFG_NAME
 set(CFG_NAME
     "kamailio"
     "kamailio"
-    CACHE STRING "Config name"
-)
+    CACHE STRING "Config name")
 
 
 include(GNUInstallDirs)
 include(GNUInstallDirs)
 
 
@@ -59,12 +57,10 @@ include(CPack)
 # Add uninstall target
 # Add uninstall target
 if(NOT TARGET uninstall)
 if(NOT TARGET uninstall)
   configure_file(
   configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake" IMMEDIATE @ONLY
-  )
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake-uninstall.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake-uninstall.cmake" IMMEDIATE @ONLY)
 
 
   add_custom_target(
   add_custom_target(
     uninstall COMMAND ${CMAKE_COMMAND} -P
     uninstall COMMAND ${CMAKE_COMMAND} -P
-                      ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake
-  )
+                      ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake-uninstall.cmake)
 endif()
 endif()

+ 0 - 0
cmake/cmake_uninstall.cmake.in → cmake/cmake-uninstall.cmake.in


+ 0 - 0
cmake/modules_docs.cmake → cmake/modules-docs.cmake


+ 20 - 32
src/modules/CMakeLists.txt

@@ -7,13 +7,12 @@ set_property(GLOBAL PROPERTY ALL_MODULE_DOC_TARGETS "")
 
 
 include(${CMAKE_SOURCE_DIR}/cmake/groups.cmake)
 include(${CMAKE_SOURCE_DIR}/cmake/groups.cmake)
 
 
-# TODO: Add proper search for all or find better way
-# TODO: Allow the selection of a group of modules defined in groups.cmake
+# TODO: Add proper search for all or find better way TODO: Allow the selection
+# of a group of modules defined in groups.cmake
 set(MODULE_GROUP_NAMES ${AVAILABLE_GROUPS})
 set(MODULE_GROUP_NAMES ${AVAILABLE_GROUPS})
 set(MODULE_GROUP_NAME
 set(MODULE_GROUP_NAME
     "DEFAULT"
     "DEFAULT"
-    CACHE STRING "Group of modules to build (all, or a custom group)"
-)
+    CACHE STRING "Group of modules to build (all, or a custom group)")
 set_property(CACHE MODULE_GROUP_NAME PROPERTY STRINGS ${MODULE_GROUP_NAMES})
 set_property(CACHE MODULE_GROUP_NAME PROPERTY STRINGS ${MODULE_GROUP_NAMES})
 
 
 # Check if the specified group exists
 # Check if the specified group exists
@@ -34,15 +33,13 @@ message(STATUS "Modules: ${MODULE_GROUP}")
 # Allow users to specify extra modules to build
 # Allow users to specify extra modules to build
 set(INCLUDE_MODULES
 set(INCLUDE_MODULES
     ""
     ""
-    CACHE STRING "List of extra modules to build (space-separated)"
-)
+    CACHE STRING "List of extra modules to build (space-separated)")
 
 
 set(EXCLUDE_MODULES
 set(EXCLUDE_MODULES
     ""
     ""
-    CACHE STRING "List of modules to exclude from building (space-separated)"
-)
+    CACHE STRING "List of modules to exclude from building (space-separated)")
 
 
-include(${CMAKE_SOURCE_DIR}/cmake/modules_docs.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/modules-docs.cmake)
 
 
 # Function to add modules from a list
 # Function to add modules from a list
 function(add_module_group GROUP_MODULES)
 function(add_module_group GROUP_MODULES)
@@ -51,48 +48,43 @@ function(add_module_group GROUP_MODULES)
     get_property(ALREADY_ADDED GLOBAL PROPERTY ADDED_MODULES_LIST)
     get_property(ALREADY_ADDED GLOBAL PROPERTY ADDED_MODULES_LIST)
     if(";${ALREADY_ADDED};" MATCHES ";${MODULE_NAME};")
     if(";${ALREADY_ADDED};" MATCHES ";${MODULE_NAME};")
       message(
       message(
-        STATUS "Module ${MODULE_NAME} has already been added. Skipping..."
-      )
+        STATUS "Module ${MODULE_NAME} has already been added. Skipping...")
     else()
     else()
       # Construct the path to the module
       # Construct the path to the module
       set(MODULE_PATH "${MODULES_DIR}/${MODULE_NAME}")
       set(MODULE_PATH "${MODULES_DIR}/${MODULE_NAME}")
-      # message(STATUS "Adding module: ${MODULE_NAME} (${MODULE_PATH})")
-      # Check if the directory exists before adding
+      # message(STATUS "Adding module: ${MODULE_NAME} (${MODULE_PATH})") Check
+      # if the directory exists before adding
       if(IS_DIRECTORY ${MODULE_PATH} AND EXISTS ${MODULE_PATH}/CMakeLists.txt)
       if(IS_DIRECTORY ${MODULE_PATH} AND EXISTS ${MODULE_PATH}/CMakeLists.txt)
         add_subdirectory(${MODULE_PATH})
         add_subdirectory(${MODULE_PATH})
         # Remove the 'lib' prefix from the module name
         # Remove the 'lib' prefix from the module name
         set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")
         set_target_properties(${MODULE_NAME} PROPERTIES PREFIX "")
 
 
-        # Add this policy to new so we can use target_link_libraries(... PRIVATE ...)
-        # to link against targets defined in children directories
+        # Add this policy to new so we can use target_link_libraries(... PRIVATE
+        # ...) to link against targets defined in children directories
         if(POLICY CMP0079)
         if(POLICY CMP0079)
           cmake_policy(SET CMP0079 NEW)
           cmake_policy(SET CMP0079 NEW)
         endif()
         endif()
         target_link_libraries(${MODULE_NAME} PRIVATE common_modules)
         target_link_libraries(${MODULE_NAME} PRIVATE common_modules)
         target_compile_definitions(
         target_compile_definitions(
           ${MODULE_NAME} PRIVATE MOD_NAMEID=${MODULE_NAME}
           ${MODULE_NAME} PRIVATE MOD_NAMEID=${MODULE_NAME}
-                                 MOD_NAME=\"${MODULE_NAME}\"
-        )
+                                 MOD_NAME=\"${MODULE_NAME}\")
         set_target_properties(
         set_target_properties(
           ${MODULE_NAME}
           ${MODULE_NAME}
           PROPERTIES
           PROPERTIES
             INSTALL_RPATH
             INSTALL_RPATH
-            "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${MAIN_NAME}"
-        )
+            "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${MAIN_NAME}")
         # Install the module to the appropriate directory under the installation
         # Install the module to the appropriate directory under the installation
         # prefix
         # prefix
         install(
         install(
           TARGETS ${MODULE_NAME}
           TARGETS ${MODULE_NAME}
           DESTINATION ${CMAKE_INSTALL_LIBDIR}/${MAIN_NAME}/modules
           DESTINATION ${CMAKE_INSTALL_LIBDIR}/${MAIN_NAME}/modules
-          COMPONENT kamailio_modules
-        )
+          COMPONENT kamailio_modules)
         # Add the module to the list of added modules
         # Add the module to the list of added modules
         set_property(GLOBAL APPEND PROPERTY ADDED_MODULES_LIST ${MODULE_NAME})
         set_property(GLOBAL APPEND PROPERTY ADDED_MODULES_LIST ${MODULE_NAME})
         if(BUILD_DOC)
         if(BUILD_DOC)
           docs_add_module(${MODULE_NAME})
           docs_add_module(${MODULE_NAME})
-          set_property(
-            GLOBAL APPEND PROPERTY ALL_MODULE_DOC_TARGETS ${MODULE_NAME}_doc
-          )
+          set_property(GLOBAL APPEND PROPERTY ALL_MODULE_DOC_TARGETS
+                                              ${MODULE_NAME}_doc)
         endif()
         endif()
       else()
       else()
         message(WARNING "Module directory ${MODULE_PATH} does not exist.")
         message(WARNING "Module directory ${MODULE_PATH} does not exist.")
@@ -108,15 +100,13 @@ separate_arguments(INCLUDE_MODULES_LIST UNIX_COMMAND "${INCLUDE_MODULES}")
 message(
 message(
   STATUS
   STATUS
     "Extra modules (if module already included already from group is ignored):
     "Extra modules (if module already included already from group is ignored):
-    ${INCLUDE_MODULES_LIST}"
-)
+    ${INCLUDE_MODULES_LIST}")
 list(APPEND FINAL_MODULES_LIST ${INCLUDE_MODULES_LIST})
 list(APPEND FINAL_MODULES_LIST ${INCLUDE_MODULES_LIST})
 
 
 # Exclude modules that were explicitly excluded by the user
 # Exclude modules that were explicitly excluded by the user
 separate_arguments(EXCLUDE_MODULES_LIST UNIX_COMMAND "${EXCLUDE_MODULES}")
 separate_arguments(EXCLUDE_MODULES_LIST UNIX_COMMAND "${EXCLUDE_MODULES}")
 message(STATUS "Excluded modules (exlcude even if in included modules):
 message(STATUS "Excluded modules (exlcude even if in included modules):
-    ${EXCLUDE_MODULES_LIST}"
-)
+    ${EXCLUDE_MODULES_LIST}")
 foreach(MODULE_NAME IN LISTS EXCLUDE_MODULES_LIST)
 foreach(MODULE_NAME IN LISTS EXCLUDE_MODULES_LIST)
   # if in list remove it and print a message
   # if in list remove it and print a message
   if(";${FINAL_MODULES_LIST};" MATCHES ";${MODULE_NAME};")
   if(";${FINAL_MODULES_LIST};" MATCHES ";${MODULE_NAME};")
@@ -140,13 +130,11 @@ if(BUILD_DOC)
   add_custom_target(
   add_custom_target(
     kamailio_docs
     kamailio_docs
     DEPENDS ${ALL_MODULE_DOC_TARGETS}
     DEPENDS ${ALL_MODULE_DOC_TARGETS}
-    COMMENT "Generating Kamailio documentation"
-  )
+    COMMENT "Generating Kamailio documentation")
 
 
   add_custom_target(
   add_custom_target(
     install_kamailio_docs
     install_kamailio_docs
     COMMAND ${CMAKE_COMMAND} --install ${CMAKE_BINARY_DIR} --component
     COMMAND ${CMAKE_COMMAND} --install ${CMAKE_BINARY_DIR} --component
             kamailio_docs
             kamailio_docs
-    DEPENDS kamailio_docs
-  )
+    DEPENDS kamailio_docs)
 endif()
 endif()