Jiri Slaby
7d9bc71470
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/ccache?expand=0&rev=157
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
Includes two commits:
|
|
https://github.com/ccache/ccache/commit/71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1
|
|
https://github.com/ccache/ccache/commit/3b09afc5f792f0bd0a15cf6b8408ea40eb069787
|
|
|
|
diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake
|
|
index 55126a31..7c39291e 100644
|
|
--- a/cmake/FindFmt.cmake
|
|
+++ b/cmake/FindFmt.cmake
|
|
@@ -3,11 +3,20 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)
|
|
if(DEP_FMT STREQUAL "BUNDLED")
|
|
message(STATUS "Using bundled Fmt as requested")
|
|
else()
|
|
- find_path(FMT_INCLUDE_DIR fmt/core.h)
|
|
+ find_path(FMT_INCLUDE_DIR NAMES fmt/base.h fmt/core.h)
|
|
find_library(FMT_LIBRARY fmt)
|
|
if(FMT_INCLUDE_DIR AND FMT_LIBRARY)
|
|
- file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h)
|
|
- string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}")
|
|
+ if(EXISTS "${FMT_INCLUDE_DIR}/fmt/base.h")
|
|
+ set(_fmt_h base.h)
|
|
+ else()
|
|
+ set(_fmt_h core.h)
|
|
+ endif()
|
|
+ file(READ "${FMT_INCLUDE_DIR}/fmt/${_fmt_h}" _fmt_h_content)
|
|
+ string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_h_content}")
|
|
+ if("${CMAKE_MATCH_0}" STREQUAL "")
|
|
+ message(FATAL_ERROR "FMT_VERSION not found")
|
|
+ return()
|
|
+ endif()
|
|
math(EXPR _fmt_major "${CMAKE_MATCH_1} / 10000")
|
|
math(EXPR _fmt_minor "${CMAKE_MATCH_1} / 100 % 100")
|
|
math(EXPR _fmt_patch "${CMAKE_MATCH_1} % 100")
|