Update version.h

Merge pull request #1890 from prince-chrismc/patch-4
Remove version requirement from fmt find_package
2025-09-29 01:29:35 +08:00 · 2021-03-25 20:34:53 +02:00 · 2021-03-25 19:22:51 +02:00 · 2021-03-24 21:54:36 -04:00 · 2021-03-25 00:14:41 +02:00 · 2021-03-24 23:10:11 +02:00
5 changed files with 24 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,7 +178,7 @@ target_link_libraries(spdlog_header_only INTERFACE Threads::Threads)
 # ---------------------------------------------------------------------------------------
 if(SPDLOG_FMT_EXTERNAL OR SPDLOG_FMT_EXTERNAL_HO)
    if(NOT TARGET fmt::fmt)
-        find_package(fmt 5.3.0 CONFIG REQUIRED)
+        find_package(fmt CONFIG REQUIRED)
    endif()
    target_compile_definitions(spdlog PUBLIC SPDLOG_FMT_EXTERNAL)
    target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_FMT_EXTERNAL)
@@ -195,6 +195,14 @@ if(SPDLOG_FMT_EXTERNAL OR SPDLOG_FMT_EXTERNAL_HO)
    set(PKG_CONFIG_REQUIRES fmt) # add dependency to pkg-config
 endif()

+# ---------------------------------------------------------------------------------------
+# Add required libraries for Android CMake build
+# ---------------------------------------------------------------------------------------
+if (ANDROID)
+    target_link_libraries(spdlog PUBLIC log)
+    target_link_libraries(spdlog_header_only INTERFACE log)
+endif ()
+
 # ---------------------------------------------------------------------------------------
 # Misc definitions according to tweak options
 # ---------------------------------------------------------------------------------------
--- a/include/spdlog/common-inl.h
+++ b/include/spdlog/common-inl.h
@@ -22,6 +22,11 @@ SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) S
    return level_string_views[l];
 }

+SPDLOG_INLINE void set_string_view(spdlog::level::level_enum l, const string_view_t &s) SPDLOG_NOEXCEPT
+{
+    level_string_views[l] = s;
+}
+
 SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT
 {
    return short_level_names[l];
--- a/include/spdlog/common.h
+++ b/include/spdlog/common.h
@@ -167,6 +167,7 @@ enum level_enum
 #endif

 SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT;
+SPDLOG_API void set_string_view(spdlog::level::level_enum l, const string_view_t &s) SPDLOG_NOEXCEPT;
 SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT;
 SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT;

--- a/include/spdlog/version.h
+++ b/include/spdlog/version.h
@@ -5,6 +5,6 @@

 #define SPDLOG_VER_MAJOR 1
 #define SPDLOG_VER_MINOR 8
-#define SPDLOG_VER_PATCH 3
+#define SPDLOG_VER_PATCH 4

 #define SPDLOG_VERSION (SPDLOG_VER_MAJOR * 10000 + SPDLOG_VER_MINOR * 100 + SPDLOG_VER_PATCH)
--- a/tests/test_misc.cpp
+++ b/tests/test_misc.cpp
@@ -55,6 +55,14 @@ TEST_CASE("level_to_string_view", "[convert_to_string_view")
    REQUIRE(spdlog::level::to_string_view(spdlog::level::off) == "off");
 }

+TEST_CASE("set_level_to_string_view", "[set_string_view")
+{
+    spdlog::level::set_string_view(spdlog::level::info, "INF");
+    REQUIRE(spdlog::level::to_string_view(spdlog::level::info) == "INF");
+    spdlog::level::set_string_view(spdlog::level::info, "info"); // set it back
+    REQUIRE(spdlog::level::to_string_view(spdlog::level::info) == "info");
+}
+
 TEST_CASE("to_short_c_str", "[convert_to_short_c_str]")
 {
    REQUIRE(std::string(spdlog::level::to_short_c_str(spdlog::level::trace)) == "T");
Author	SHA1	Message	Date
Gabi Melman	012fe99ab1	Update version.h	2021-03-25 20:34:53 +02:00
Gabi Melman	8ff5a3e096	Merge pull request #1890 from prince-chrismc/patch-4 Remove version requirement from fmt find_package	2021-03-25 19:22:51 +02:00
Chris Mc	65317eb019	Remove version requirement from fmt find_package By introducing 'no module' support this inadvertently triggered the find_package to use the "full version" version selection. From https://cmake.org/cmake/help/latest/command/find_package.html#version-selection: > When the [version] argument is given, Config mode will only find a version of the package that claims compatibility with the requested version (see format specification). FMT does not set this configuration https://github.com/fmtlib/fmt/blob/7.1.3/support/cmake/fmt-config.cmake.in... but regardless it would not be "any compatibility" based on version semantics. Which causes this error. v1.8.2 builds perfectly fine. ``` CMake Error at CMakeLists.txt:181 (find_package): Could not find a configuration file for package "fmt" that is compatible with requested version "5.3.0". The following configuration files were considered but not accepted: /home/proj/build/e98598522b7c484d9220bffc7ec84474515facbc/fmt-config.cmake, version: 7.1.3 ```	2021-03-24 21:54:36 -04:00
Gabi Melman	e86f450428	Merge pull request #1885 from ahmedyarub/fix_android_build Add required libraries for Android CMake build	2021-03-25 00:14:41 +02:00
Gabi Melman	7b2776fdc7	Merge pull request #1888 from stevenlunt/set_string_view added spdlog::level::set_string_view to enable alternate log level na…	2021-03-24 23:10:11 +02:00
steven lunt	2a16d1d230	added spdlog::level::set_string_view to enable alternate log level names without changing the build via SPDLOG_LEVEL_NAMES	2021-03-24 16:22:54 -04:00
Ahmed Yarub Hani Al Nuaimi	a2e28443f0	Add required libraries for Android CMake build	2021-03-22 00:08:17 -03:00