Форматирование кода

CMLibAuxilarySymlinks.cmake

@@ -1,3 +1,4 @@
+# cmake-format: off
 if(NOT TARGET create_auxilary_symlinks)
   if(UNIX)
     add_custom_target(
@@ -5,15 +6,20 @@ if(NOT TARGET create_auxilary_symlinks)
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/files
       # Ссылка на каталог с журналами
-      COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/log ${CMAKE_BINARY_DIR}/files/log
+      COMMAND ${CMAKE_COMMAND} -E create_symlink
+              ${CMAKE_SOURCE_DIR}/files/log ${CMAKE_BINARY_DIR}/files/log
       # Ссылка на каталог с обрабатываемыми данными
-      COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/lib ${CMAKE_BINARY_DIR}/files/lib
+      COMMAND ${CMAKE_COMMAND} -E create_symlink
+              ${CMAKE_SOURCE_DIR}/files/lib ${CMAKE_BINARY_DIR}/files/lib
       # Ссылка на каталог с временными данными
-      COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/cache
-              ${CMAKE_BINARY_DIR}/files/cache
+      COMMAND ${CMAKE_COMMAND} -E create_symlink
+              ${CMAKE_SOURCE_DIR}/files/cache ${CMAKE_BINARY_DIR}/files/cache
       # Ссылка на каталог с постоянными данными
-      COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/data ${CMAKE_BINARY_DIR}/files/data
+      COMMAND ${CMAKE_COMMAND} -E create_symlink
+              ${CMAKE_SOURCE_DIR}/files/data ${CMAKE_BINARY_DIR}/files/data
       # Ссылка на каталог настроек
-      COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/files/etc ${CMAKE_BINARY_DIR}/etc)
+      COMMAND ${CMAKE_COMMAND} -E create_symlink
+              ${CMAKE_SOURCE_DIR}/files/etc ${CMAKE_BINARY_DIR}/etc)
   endif()
 endif()
+# cmake-format: on

CMLibCPackDeb.cmake

@@ -16,43 +16,66 @@ if(NOT CPACK_DEB_COMPONENT_INSTALL)
   set(CPACK_DEB_COMPONENT_INSTALL ON)
 endif()
 
+option(CMLIB_CPACK_DEFAULT_SCHEME "Use packaging default scheme" ON)
+
+if(CMLIB_CPACK_DEFAULT_SCHEME)
   # Если имя компонента по умолчанию не определено, то устанавливается MAIN
   if(NOT CMAKE_INSTALL_DEFAULT_COMPONENT_NAME)
-  set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME MAIN)
+    set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME main)
   endif()
 
-# В списке компонентов обязательно должны быть MAIN и DEV
-list(APPEND CPACK_COMPONENTS_ALL MAIN DEV)
+  # В списке компонентов обязательно должны быть main, base-dev, libs-dev и doc
+  list(
+    APPEND
+    CPACK_COMPONENTS_ALL
+    main
+    base-dev
+    libs-dev
+    doc)
   list(REMOVE_DUPLICATES CPACK_COMPONENTS_ALL)
 
-# Правило формирования имени пакета и файла для компонента MAIN
+  # Правило формирования имени пакета и файла для компонента main
   set(CPACK_DEBIAN_MAIN_PACKAGE_NAME "${CMLIB_PROJECT_NAME_LOWER}")
   set(CPACK_DEBIAN_MAIN_FILE_NAME
-    "${CMLIB_PROJECT_NAME_LOWER}_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb")
+      ${CMLIB_PROJECT_NAME_LOWER}_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb)
 
-# Правило формирования имени пакета и файла для остальных компонентов
-foreach(C ${CPACK_COMPONENTS_ALL})
-  if(NOT "${C}" STREQUAL "MAIN")
-    string(TOLOWER "${C}" cl)
-    set(CPACK_DEBIAN_${C}_PACKAGE_NAME "${CMLIB_PROJECT_NAME_LOWER}-${cl}")
-    set(CPACK_DEBIAN_${C}_FILE_NAME
-        "${CMLIB_PROJECT_NAME_LOWER}-${cl}_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb")
+  # Правило формирования имени пакета и файла для компонента base-dev
+  set(CPACK_DEBIAN_BASE-DEV_PACKAGE_NAME "${CMLIB_PROJECT_NAME_LOWER}-base-dev")
+  set(CPACK_DEBIAN_BASE-DEV_FILE_NAME
+      ${CMLIB_PROJECT_NAME_LOWER}-base-dev_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb)
+
+  # Правило формирования имени пакета и файла для компонента libs-dev
+  set(CPACK_DEBIAN_LIBS-DEV_PACKAGE_NAME ${CMLIB_PROJECT_NAME_LOWER}-dev)
+  set(CPACK_DEBIAN_LIBS-DEV_FILE_NAME
+      ${CMLIB_PROJECT_NAME_LOWER}-dev_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb)
+
+  set(CPACK_DEBIAN_LIBS-DEV_PACKAGE_DEPENDS "${CMLIB_PROJECT_NAME_LOWER}-base-dev")
+
+  foreach(_C ${CPACK_COMPONENTS_ALL})
+    string(TOLOWER ${_C} _cl)
+    string(TOUPPER ${_C} _cu)
+    # Правила формирования имени пакета и файла для остальных компонентов
+    if(NOT ${_cl} STREQUAL main AND NOT ${_cl} STREQUAL base-dev AND NOT ${_cl} STREQUAL libs-dev)
+      set(CPACK_DEBIAN_${_cu}_PACKAGE_NAME "${CMLIB_PROJECT_NAME_LOWER}-${_cl}")
+      set(CPACK_DEBIAN_${_cu}_FILE_NAME
+          "${CMLIB_PROJECT_NAME_LOWER}-${_cl}_${CPACK_PACKAGE_VERSION}_${CPACK_TARGET_ARCH}.deb")
+    endif()
+
+    # Если в каталоге ${CMAKE_SOURCE_DIR}/cmake/deb/${_cl} находятся сценарии сопровождающего
+    # postinst, preinst, postrm и prerm, то они будут добавлены к пакету.
+    if(EXISTS "${CMAKE_SOURCE_DIR}/cmake/deb/${_cl}/preinst")
+      list(APPEND CPACK_DEBIAN_${_cu}_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/deb/${_cl}/preinst")
+    endif()
+    if(EXISTS "${CMAKE_SOURCE_DIR}/cmake/deb/${_cl}/postinst")
+      list(APPEND CPACK_DEBIAN_${_cu}_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/deb/${_cl}/postinst")
+    endif()
+    if(EXISTS "${CMAKE_SOURCE_DIR}/cmake/deb/${_cl}/prerm")
+      list(APPEND CPACK_DEBIAN_${_cu}_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/deb/${_cl}/prerm")
+    endif()
+    if(EXISTS "${CMAKE_SOURCE_DIR}/cmake/deb/${_cl}/postrm")
+      list(APPEND CPACK_DEBIAN_${_cu}_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/deb/${_cl}/postrm")
     endif()
   endforeach()
-
-# Если в каталоге ${CMAKE_SOURCE_DIR}/cmake/deb находятся сценарии сопровождающего
-# postinst, preinst, postrm и prerm, то они будут добавлены к пакету.
-if(EXISTS "${CMAKE_SOURCE_DIR}/cmake/deb/preinst")
-  list(APPEND CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/deb/preinst")
-endif()
-if(EXISTS "${CMAKE_SOURCE_DIR}/cmake/deb/postinst")
-  list(APPEND CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/deb/postinst")
-endif()
-if(EXISTS "${CMAKE_SOURCE_DIR}/cmake/deb/prerm")
-  list(APPEND CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/deb/prerm")
-endif()
-if(EXISTS "${CMAKE_SOURCE_DIR}/cmake/deb/postrm")
-  list(APPEND CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/deb/postrm")
 endif()
 
 if(UNIX AND NOT TARGET deb)

CMLibPkgConfig.cmake

@@ -10,5 +10,6 @@ function(generate_pkgconfig library_name)
   else()
     configure_file(${CMLIB_MODULE_DIR}/pc/lib-header-only.pc.in ${CMAKE_BINARY_DIR}/${library_name}.pc)
   endif()
-  install(FILES ${CMAKE_BINARY_DIR}/${library_name}.pc COMPONENT ${_PKG_COMPONENT} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+  install(FILES ${CMAKE_BINARY_DIR}/${library_name}.pc COMPONENT ${_PKG_COMPONENT}
+          DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 endfunction()