morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

[cmake,json] limit jansson detection

Browse Source 
discard versions older than 2.13
This commit is contained in:
Armin Novak
2025-10-01 13:25:13 +02:00
parent 4300fc586d
commit 34a835c412
1 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
cmake/JsonDetect.cmake
View File

@@ -1,9 +1,9 @@
function(detect_package name) function(detect_package name)
set(options REQUIRED) set(options REQUIRED)
set(oneValueArgs HEADER LIBRARY PKGCONFIG CMAKE) set(oneValueArgs HEADER LIBRARY PKGCONFIG CMAKE VERSION VERSION_STR)
cmake_parse_arguments(PARSE_ARGV 0 arg "${options}" "${oneValueArgs}" "${multiValueArgs}") cmake_parse_arguments(PARSE_ARGV 0 arg "${options}" "${oneValueArgs}" "${multiValueArgs}")
find_package(${name}) find_package(${name} ${arg_VERSION})
if(NOT ${name}_FOUND) if(NOT ${name}_FOUND)
# Fallback detection: # Fallback detection:
# some distributions only ship pkg-config and skip CMake config files. # some distributions only ship pkg-config and skip CMake config files.
@@ -14,6 +14,9 @@ function(detect_package name)
else() else()
set(module ${name}) set(module ${name})
endif() endif()
if(arg_VERSION)
string(APPEND module ">=${arg_VERSION}")
endif()
pkg_check_modules(${name} ${module}) pkg_check_modules(${name} ${module})
endif() endif()
@@ -34,8 +37,28 @@ function(detect_package name)
set(${name}_LINK_LIBRARIES "${${name}_LIBRARY}") set(${name}_LINK_LIBRARIES "${${name}_LIBRARY}")
set(${name}_INCLUDE_DIRS "${${name}_HEADER}") set(${name}_INCLUDE_DIRS "${${name}_HEADER}")
get_filename_component(${name}_LIB_FILE "${${name}_LIBRARY}" NAME_WE) get_filename_component(${name}_LIB_FILE "${${name}_LIBRARY}" NAME_WE)
set(regex "^${CMAKE_SHARED_LIBRARY_SUFFIX}") set(regex "^${CMAKE_SHARED_LIBRARY_PREFIX}")
string(REGEX REPLACE ${regex} ${name}_LIBRARIES "${${name}_LIB_FILE}") string(REGEX REPLACE "${regex}" "" ${name}_LIBRARIES "${${name}_LIB_FILE}")
if(arg_VERSION)
find_file(HEADER NAMES ${arg_HEADER} ${name}.h ${arg_PKGCONFIG}.h ${arg_CMAKE}.h
PATH_SUFFIXES ${name} ${arg_PKGCONFIG} ${arg_CMAKE} PATHS ${name}_HEADER
)
file(STRINGS ${HEADER} file_data REGEX "[ \t ]${arg_VERSION_STR}[ \t ]")
string(REGEX MATCH "([0-9]+\\.[0-9]+(\\.[0-9]+)?)" file_version "${file_data}")
if(file_version)
if(file_version GREATER_EQUAL "${arg_VERSION}")
set(${name}_FOUND ON)
else()
if(arg_REQUIRED)
message(FATAL_ERROR "${name} has version ${file_version}, but >= ${arg_VERSION} required")
else()
message(WARNING "${name} has version ${file_version}, but >= ${arg_VERSION} required")
endif()
endif()
endif()
else()
set(${name}_FOUND ON)
endif()
endif() endif()
endif() endif()
@@ -86,7 +109,18 @@ unset(cJSON_FOUND CACHE)
unset(jansson_FOUND CACHE) unset(jansson_FOUND CACHE)
if(NOT WITH_JSON_DISABLED) if(NOT WITH_JSON_DISABLED)
if(WITH_JANSSON_REQUIRED) if(WITH_JANSSON_REQUIRED)
detect_package(jansson CMAKE jansson::jansson HEADER jansson.h REQUIRED) detect_package(
jansson
CMAKE
jansson::jansson
HEADER
jansson.h
VERSION
2.13
VERSION_STR
JANSSON_VERSION
REQUIRED
)
elseif(WITH_JSONC_REQUIRED) elseif(WITH_JSONC_REQUIRED)
detect_package(json-c CMAKE json-c::json-c HEADER json-c/json.h REQUIRED) detect_package(json-c CMAKE json-c::json-c HEADER json-c/json.h REQUIRED)
elseif(WITH_CJSON_REQUIRED) elseif(WITH_CJSON_REQUIRED)
@@ -102,7 +136,17 @@ if(NOT WITH_JSON_DISABLED)
) )
else() else()
# nothing required, so do a non fatal check for all # nothing required, so do a non fatal check for all
detect_package(jansson CMAKE jansson::jansson HEADER jansson.h) detect_package(
jansson
CMAKE
jansson::jansson
HEADER
jansson.h
VERSION
2.13
VERSION_STR
JANSSON_VERSION
)
detect_package(json-c CMAKE json-c::json-c HEADER json-c/json.h) detect_package(json-c CMAKE json-c::json-c HEADER json-c/json.h)
detect_package( detect_package(
cJSON cJSON