diff options
| author | Montellese <sascha.montellese@gmail.com> | 2020-04-20 13:44:56 +0200 |
|---|---|---|
| committer | Montellese <sascha.montellese@gmail.com> | 2020-04-20 20:02:48 +0200 |
| commit | 172737a27aaa7f20fb9b9a1e149379f1a13b4e2e (patch) | |
| tree | 6be58a16918c82ec068f8828faacac41be4fa537 /tools/depends | |
| parent | 7091757383c384f7cde853f670346a5ce05f21d5 (diff) | |
[depends] patch spdlog to require at least fmt 5.3.0
Diffstat (limited to 'tools/depends')
| -rw-r--r-- | tools/depends/target/libspdlog/0001-fix_fmt_version.patch | 11 | ||||
| -rw-r--r-- | tools/depends/target/libspdlog/Makefile | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/tools/depends/target/libspdlog/0001-fix_fmt_version.patch b/tools/depends/target/libspdlog/0001-fix_fmt_version.patch new file mode 100644 index 0000000000..1c7b86c327 --- /dev/null +++ b/tools/depends/target/libspdlog/0001-fix_fmt_version.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -147,7 +147,7 @@ + #--------------------------------------------------------------------------------------- + if(SPDLOG_FMT_EXTERNAL OR SPDLOG_FMT_EXTERNAL_HO) + if (NOT TARGET fmt::fmt) +- find_package(fmt REQUIRED) ++ find_package(fmt 5.3.0 REQUIRED) + endif () + target_compile_definitions(spdlog PUBLIC SPDLOG_FMT_EXTERNAL) + target_compile_definitions(spdlog_header_only INTERFACE SPDLOG_FMT_EXTERNAL) diff --git a/tools/depends/target/libspdlog/Makefile b/tools/depends/target/libspdlog/Makefile index 69a396f876..7de6e9567a 100644 --- a/tools/depends/target/libspdlog/Makefile +++ b/tools/depends/target/libspdlog/Makefile @@ -1,5 +1,5 @@ -include ../../Makefile.include -DEPS = Makefile +DEPS = Makefile 0001-fix_fmt_version.patch # lib name, version LIBNAME=spdlog @@ -52,6 +52,7 @@ endif rm -rf $(PLATFORM); mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); rm -rf build; mkdir -p build + cd $(PLATFORM); patch -p1 -i ../0001-fix_fmt_version.patch cd $(PLATFORM)/build; $(CMAKE) $(CMAKE_OPTIONS) .. $(LIBDYLIB): $(PLATFORM) |