1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
|
From: Alexandre Rossi <niol@zincube.net>
Subject: fix libfmt version probe with libfmt < 11
Forwarded: https://github.com/transmission/transmission/pull/7772
--- transmission.git.orig/cmake/FindFmt.cmake 2025-11-06 15:03:17.543747551 +0100
+++ transmission.git/cmake/FindFmt.cmake 2025-11-06 15:10:08.419422792 +0100
@@ -6,8 +6,11 @@
INTERFACE
${${CMAKE_FIND_PACKAGE_NAME}_INCLUDE})
-file(READ "${${CMAKE_FIND_PACKAGE_NAME}_INCLUDE}/fmt/base.h" _FMT_BASE_H)
-if(_FMT_BASE_H MATCHES "FMT_VERSION ([0-9]+)([0-9][0-9])([0-9][0-9])")
+find_file(_FMT_VERSION_H_PATH
+ NAMES "fmt/base.h" "fmt/core.h"
+ PATHS "${${CMAKE_FIND_PACKAGE_NAME}_INCLUDE}")
+file(READ "${_FMT_VERSION_H_PATH}" _FMT_VERSION_H)
+if(_FMT_VERSION_H MATCHES "FMT_VERSION ([0-9]+)([0-9][0-9])([0-9][0-9])")
# Use math to skip leading zeros if any.
math(EXPR _FMT_VERSION_MAJOR ${CMAKE_MATCH_1})
math(EXPR _FMT_VERSION_MINOR ${CMAKE_MATCH_2})
|