diff options
| author | Rechi <Rechi@users.noreply.github.com> | 2020-02-12 17:17:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 17:17:55 +0100 |
| commit | 85ef4a02f5b2d35c8ecad539fb711aee6ecbfb02 (patch) | |
| tree | 620d1f9dc35bafa2d23d6070cd4918eebcfc9aa1 | |
| parent | 353908807e155e27649ab9eba8fe1c5d88740e42 (diff) | |
| parent | 157b0ef05cfb99408a5f28472580ca1241f078f3 (diff) | |
Merge pull request #17362 from Rechi/depends/libfmt
[depends] bump libfmt to 6.1.2
| -rw-r--r-- | cmake/modules/FindFmt.cmake | 2 | ||||
| -rw-r--r-- | tools/depends/target/libfmt/Makefile | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cmake/modules/FindFmt.cmake b/cmake/modules/FindFmt.cmake index 47cf8be864..9588501382 100644 --- a/cmake/modules/FindFmt.cmake +++ b/cmake/modules/FindFmt.cmake @@ -39,6 +39,8 @@ if(ENABLE_INTERNAL_FMT) DOWNLOAD_DIR ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/download PREFIX ${CORE_BUILD_DIR}/fmt CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} + -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS} + -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_INSTALL_LIBDIR=lib -DFMT_DOC=OFF diff --git a/tools/depends/target/libfmt/Makefile b/tools/depends/target/libfmt/Makefile index 6c61bceaa9..5bc7b7bc40 100644 --- a/tools/depends/target/libfmt/Makefile +++ b/tools/depends/target/libfmt/Makefile @@ -3,16 +3,15 @@ DEPS = Makefile # lib name, version LIBNAME=fmt -VERSION=5.1.0 +VERSION=6.1.2 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz -CMAKE_OPTIONS=-DFMT_DOC=OFF -DFMT_INSTALL=ON -DFMT_TEST=OFF -DFMT_USE_CPP11=ON +CMAKE_OPTIONS=-DCMAKE_CXX_STANDARD=14 -DCMAKE_CXX_EXTENSIONS:BOOL=OFF -DFMT_DOC=OFF -DFMT_INSTALL=ON -DFMT_TEST=OFF ifeq ($(CROSS_COMPILING), yes) DEPS += ../../Makefile.include else - CXXFLAGS += -std=c++11 ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) ifeq ($(PLATFORM),) @@ -28,7 +27,7 @@ else endif endif -LIBDYLIB=$(PLATFORM)/build/$(LIBNAME)/libfmt.a +LIBDYLIB=$(PLATFORM)/build/libfmt.a .PHONY: .installed-native @@ -61,4 +60,3 @@ clean: distclean:: rm -rf $(PLATFORM) .installed-$(PLATFORM) - |