Bläddra i källkod

cmake: Fix formatting and add some comments.

- Remove unused replacement SRC_NAME to MAIN_NAME
Xenofon Karamanos 5 månader sedan
förälder
incheckning
0550b63007

+ 2 - 1
CMakeLists.txt

@@ -16,7 +16,8 @@ if(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
   message(
     FATAL_ERROR
       "In-source builds not allowed. Please make a new directory (called a build directory) \
-and run CMake again accordingly.")
+and run CMake again accordingly."
+  )
 endif()
 
 # ---- Project settings ----

+ 8 - 6
src/CMakeLists.txt

@@ -1,4 +1,6 @@
 # Set the installation paths
+message(STATUS "CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
+message(STATUS "CMAKE_LIBRARY_ARCHITECTURE: ${CMAKE_LIBRARY_ARCHITECTURE}")
 message(STATUS "Cross compile: ${CMAKE_CROSSCOMPILING}")
 
 message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
@@ -108,6 +110,7 @@ endif()
 # -----------------------
 add_executable(kamailio ${CMAKE_CURRENT_SOURCE_DIR}/main.c)
 add_dependencies(kamailio GenerateParser)
+
 # Enable ENABLE_EXPORTS property so modules can link from symbols found in
 # kamailio executable.
 set_target_properties(kamailio PROPERTIES ENABLE_EXPORTS TRUE OUTPUT_NAME ${MAIN_NAME})
@@ -169,9 +172,8 @@ add_custom_command(
     "s#/etc/${CFG_NAME}/${CFG_NAME}\.cfg#${CMAKE_INSTALL_FULL_SYSCONFDIR}/${MAIN_NAME}/${MAIN_NAME}.cfg#g"
     -e "s#/usr/sbin/#${CMAKE_INSTALL_FULL_SBINDIR}/#g" -e
     "s#/usr/lib/${CFG_NAME}/#${CMAKE_INSTALL_FULL_LIBDIR}/${MAIN_NAME}/#g" -e
-    "s#/usr/share/doc/${CFG_NAME}/#${CMAKE_INSTALL_FULL_DOCDIR}/#g" -e
-    "s#${SRC_NAME}#${MAIN_NAME}#g" < ${CMAKE_SOURCE_DIR}/doc/man/kamailio.8 >
-    ${CMAKE_CURRENT_BINARY_DIR}/${MAIN_NAME}.8
+    "s#/usr/share/doc/${CFG_NAME}/#${CMAKE_INSTALL_FULL_DOCDIR}/#g" <
+    ${CMAKE_SOURCE_DIR}/doc/man/kamailio.8 > ${CMAKE_CURRENT_BINARY_DIR}/${MAIN_NAME}.8
   DEPENDS ${CMAKE_SOURCE_DIR}/doc/man/kamailio.8
 )
 
@@ -182,9 +184,8 @@ add_custom_command(
     "s#/etc/${CFG_NAME}/${CFG_NAME}\.cfg#${CMAKE_INSTALL_FULL_SYSCONFDIR}/${MAIN_NAME}/${MAIN_NAME}.cfg#g"
     -e "s#/usr/sbin/#${CMAKE_INSTALL_FULL_SBINDIR}/#g" -e
     "s#/usr/lib/${CFG_NAME}/#${CMAKE_INSTALL_FULL_LIBDIR}/${MAIN_NAME}/#g" -e
-    "s#/usr/share/doc/${CFG_NAME}/#${CMAKE_INSTALL_FULL_DOCDIR}/#g" -e
-    "s#${SRC_NAME}#${MAIN_NAME}#g" < ${CMAKE_SOURCE_DIR}/doc/man/kamailio.cfg.5 >
-    ${CMAKE_CURRENT_BINARY_DIR}/${MAIN_NAME}.cfg.5
+    "s#/usr/share/doc/${CFG_NAME}/#${CMAKE_INSTALL_FULL_DOCDIR}/#g" <
+    ${CMAKE_SOURCE_DIR}/doc/man/kamailio.cfg.5 > ${CMAKE_CURRENT_BINARY_DIR}/${MAIN_NAME}.cfg.5
   DEPENDS ${CMAKE_SOURCE_DIR}/doc/man/kamailio.cfg.5
 )
 
@@ -195,6 +196,7 @@ add_custom_target(
 )
 add_dependencies(man kamctl_man)
 add_dependencies(man kamcmd_man)
+
 # These are the modules man pages if any exist
 add_dependencies(man kamailio_docs_man)
 

+ 2 - 0
src/core/CMakeLists.txt

@@ -1,5 +1,7 @@
 # This is just for Debugging and print the compile definitions and options
 # for the common target
+message(STATUS "Flags defined for all targets: ${CMAKE_C_FLAGS}")
+
 get_target_property(MY_INTERFACE_DEFINITIONS common INTERFACE_COMPILE_DEFINITIONS)
 message(STATUS "Compile definitions for common: ${MY_INTERFACE_DEFINITIONS}")
 

+ 2 - 0
src/modules/CMakeLists.txt

@@ -173,6 +173,8 @@ add_custom_target(
   COMMENT "Generating Kamailio documentation"
 )
 
+# No component kamailio_docs is defined after component based installation
+# TODO: Fix if possible
 add_custom_target(
   install_kamailio_docs
   COMMAND ${CMAKE_COMMAND} --install ${CMAKE_BINARY_DIR} --component kamailio_docs

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

@@ -69,10 +69,10 @@ if(NOT PERL_TYPEMAP)
       ERROR_VARIABLE PERL_LIBPATH_ERROR # error of the command if any
       OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE
     )
-    message(WARNING "PERL_LIBPATH: ${PERL_LIBPATH}")
+    message(STATUS "PERL_LIBPATH: ${PERL_LIBPATH}")
   endif()
   set(PERL_TYPEMAP ${PERL_LIBPATH}/ExtUtils/typemap)
-  message(WARNING "PERL_TYPEMAP: ${PERL_TYPEMAP}")
+  message(STATUS "PERL_TYPEMAP: ${PERL_TYPEMAP}")
 endif()
 
 set(PERL_PODFILES ${CMAKE_CURRENT_SOURCE_DIR}/kamailioxs.xs)

+ 2 - 3
utils/kamcmd/CMakeLists.txt

@@ -51,9 +51,8 @@ add_custom_command(
     "s#/etc/${CFG_NAME}/${CFG_NAME}\.cfg#${CMAKE_INSTALL_FULL_SYSCONFDIR}/${MAIN_NAME}/${MAIN_NAME}.cfg#g"
     -e "s#/usr/sbin/#${CMAKE_INSTALL_FULL_SBINDIR}/#g" -e
     "s#/usr/lib/${CFG_NAME}/modules/#${CMAKE_INSTALL_FULL_LIBDIR}/${MAIN_NAME}/#g" -e
-    "s#/usr/share/doc/${CFG_NAME}/#${CMAKE_INSTALL_FULL_DOCDIR}/#g" -e
-    "s#${SRC_NAME}#${MAIN_NAME}#g" < ${CMAKE_CURRENT_SOURCE_DIR}/kamcmd.8 >
-    ${CMAKE_CURRENT_BINARY_DIR}/kamcmd.8
+    "s#/usr/share/doc/${CFG_NAME}/#${CMAKE_INSTALL_FULL_DOCDIR}/#g" <
+    ${CMAKE_CURRENT_SOURCE_DIR}/kamcmd.8 > ${CMAKE_CURRENT_BINARY_DIR}/kamcmd.8
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kamcmd.8
 )
 

+ 5 - 2
utils/kamctl/CMakeLists.txt

@@ -9,6 +9,7 @@ set(SHARE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/${MAIN_NAME}")
 
 include(${CMAKE_SOURCE_DIR}/cmake/db_files.cmake)
 
+# --- kamctl  ---
 set(KAMCTL_BASE_FILES kamctl.base kamctl.ctlbase kamctl.rpcfifo kamctl.ser kamctl.sqlbase)
 
 # Install kamctl.base and the rest
@@ -35,11 +36,11 @@ install(
   COMPONENT kamailio-core
 )
 
-# Set up and install kamdbctl stuff
+# --- kamdbctl  ---
+# Setup and install kamdbctl stuff
 set(KAMDBCTL_BASE_FILES kamdbctl.base)
 
 # Install kamdbctl
-
 foreach(file IN LISTS KAMDBCTL_BASE_FILES)
   add_kamdbctl_db_files("kamailio-core" ${file})
 endforeach()
@@ -113,6 +114,7 @@ add_custom_target(
   kamctl_man DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/kamctl.8 ${CMAKE_CURRENT_BINARY_DIR}/kamdbctl.8
 )
 
+# In order for these files to be installed, one has to built the kamctl_man target
 install(
   FILES ${CMAKE_CURRENT_BINARY_DIR}/kamctl.8 ${CMAKE_CURRENT_BINARY_DIR}/kamdbctl.8
   DESTINATION ${CMAKE_INSTALL_MANDIR}/man8
@@ -121,6 +123,7 @@ install(
 )
 
 # Install targets
+# TODO: FIX IF POSSIBLE after component based-installed components do not exist
 # Custom target for installing the kamailio-cfg component
 add_custom_target(
   install-kamailio-utils-cfg