From 4c698a7d8975ccda08cf3b9a69eba71a30ea121d Mon Sep 17 00:00:00 2001 From: Philipp Kerling Date: Sun, 24 Mar 2024 23:27:19 +0100 Subject: [depends] use c++20 --- tools/depends/target/fmt/Makefile | 2 +- tools/depends/target/smctemp/Makefile | 1 + tools/depends/target/spdlog/Makefile | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/depends/target') diff --git a/tools/depends/target/fmt/Makefile b/tools/depends/target/fmt/Makefile index 642d8c8583..28d2ecc269 100644 --- a/tools/depends/target/fmt/Makefile +++ b/tools/depends/target/fmt/Makefile @@ -3,7 +3,7 @@ include FMT-VERSION DEPS = Makefile FMT-VERSION ../../download-files.include \ 001-windows-pdb-symbol-gen.patch -CMAKE_OPTIONS=-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_EXTENSIONS:BOOL=OFF -DFMT_DOC=OFF -DFMT_INSTALL=ON -DFMT_TEST=OFF +CMAKE_OPTIONS=-DFMT_DOC=OFF -DFMT_INSTALL=ON -DFMT_TEST=OFF ifeq ($(CROSS_COMPILING), yes) DEPS += ../../Makefile.include diff --git a/tools/depends/target/smctemp/Makefile b/tools/depends/target/smctemp/Makefile index b257625403..6ffbc0e789 100644 --- a/tools/depends/target/smctemp/Makefile +++ b/tools/depends/target/smctemp/Makefile @@ -3,6 +3,7 @@ DEPS = ../../Makefile.include SMCTEMP-VERSION Makefile ../../download-files.inc LIBDYLIB=$(PLATFORM)/$(BYPRODUCT) +CXXFLAGS += -std=c++17 -framework IOKit ifeq ($(CPU), arm64) CXXFLAGS += -DARCH_TYPE_ARM64 else diff --git a/tools/depends/target/spdlog/Makefile b/tools/depends/target/spdlog/Makefile index 9e8b36d401..88b3e86377 100644 --- a/tools/depends/target/spdlog/Makefile +++ b/tools/depends/target/spdlog/Makefile @@ -13,7 +13,6 @@ CMAKE_OPTIONS= \ ifeq ($(CROSS_COMPILING), yes) DEPS += ../../Makefile.include else - CXXFLAGS += -std=c++17 ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) ifeq ($(PLATFORM),) -- cgit v1.2.3