Module: kamailio Branch: master Commit: ad35c24196c921a3e870f4a48b6d286748d78d48 URL: https://github.com/kamailio/kamailio/commit/ad35c24196c921a3e870f4a48b6d2867...
Author: Xenofon Karamanos xk@gilawa.com Committer: Xenofon Karamanos xk@gilawa.com Date: 2024-12-30T15:48:15Z
cmake: Update min version required to 3.10
---
Modified: cmake/compiler-specific.cmake Modified: cmake/defs.cmake Modified: cmake/os-specific.cmake Modified: src/modules/CMakeLists.txt Modified: src/modules/presence/CMakeLists.txt Modified: src/modules/presence_xml/CMakeLists.txt Modified: utils/kamctl/CMakeLists.txt
---
Diff: https://github.com/kamailio/kamailio/commit/ad35c24196c921a3e870f4a48b6d2867... Patch: https://github.com/kamailio/kamailio/commit/ad35c24196c921a3e870f4a48b6d2867...
---
diff --git a/cmake/compiler-specific.cmake b/cmake/compiler-specific.cmake index 7ecd87b75ad..950b64941ab 100644 --- a/cmake/compiler-specific.cmake +++ b/cmake/compiler-specific.cmake @@ -2,7 +2,6 @@ # common flags and options for the project The flags are defined as INTERFACE # properties of the common library The flags are then used by the other # libraries and executables -cmake_minimum_required(VERSION 3.10)
# Define the common flags and options for GCC option(PROFILE "Enable profiling" OFF) diff --git a/cmake/defs.cmake b/cmake/defs.cmake index bc08b2ce4ac..a01a43eaf65 100644 --- a/cmake/defs.cmake +++ b/cmake/defs.cmake @@ -2,7 +2,6 @@ # common flags and options for the project The flags are defined as INTERFACE # properties of the common library The flags are then used by the other # libraries and executables -cmake_minimum_required(VERSION 3.10)
add_library(common INTERFACE)
diff --git a/cmake/os-specific.cmake b/cmake/os-specific.cmake index 7fbbd4763a2..d70a44cf379 100644 --- a/cmake/os-specific.cmake +++ b/cmake/os-specific.cmake @@ -1,8 +1,7 @@ -# Quite analogous to the Makefile.defs file -# This file is used to define the common flags and options for the project -# The flags are defined as INTERFACE properties of the common library -# The flags are then used by the other libraries and executables -cmake_minimum_required(VERSION 3.10) +# Quite analogous to the Makefile.defs file This file is used to define the +# common flags and options for the project The flags are defined as INTERFACE +# properties of the common library The flags are then used by the other +# libraries and executables
set(OS_SPECIFIC_DIR "${CMAKE_SOURCE_DIR}/cmake/os-specific") if(CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index a1b474a4502..6570b4afdf2 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -73,6 +73,7 @@ function(add_module_group group_modules) if(POLICY CMP0079) cmake_policy(SET CMP0079 NEW) endif() + target_link_libraries(${module_name} PRIVATE common_modules) target_compile_definitions( ${module_name} PRIVATE MOD_NAMEID=${module_name} diff --git a/src/modules/presence/CMakeLists.txt b/src/modules/presence/CMakeLists.txt index dbac5d4862e..ef19545fcb2 100644 --- a/src/modules/presence/CMakeLists.txt +++ b/src/modules/presence/CMakeLists.txt @@ -1,6 +1,3 @@ -# 3.12 For libxml2 target -cmake_minimum_required(VERSION 3.12) - file(GLOB MODULE_SOURCES "*.c")
add_library(${module_name} SHARED ${MODULE_SOURCES}) diff --git a/src/modules/presence_xml/CMakeLists.txt b/src/modules/presence_xml/CMakeLists.txt index dbac5d4862e..ef19545fcb2 100644 --- a/src/modules/presence_xml/CMakeLists.txt +++ b/src/modules/presence_xml/CMakeLists.txt @@ -1,6 +1,3 @@ -# 3.12 For libxml2 target -cmake_minimum_required(VERSION 3.12) - file(GLOB MODULE_SOURCES "*.c")
add_library(${module_name} SHARED ${MODULE_SOURCES}) diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index 2b017836025..75208d63222 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.10) - project(kamailio_utils)
# if(NOT basedir) set(KAMCTL_TMP_DIR "/tmp") else() set(KAMCTL_TMP_DIR
-
Xenofon Karamanos