From 5f8335c1e49ce108ef3481863833c98efa00411b Mon Sep 17 00:00:00 2001
From: manuel <manuel@mausz.at>
Date: Thu, 2 Jul 2020 23:09:26 +0200
Subject: sync with upstream

---
 cmake/modules/FindFmt.cmake | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'cmake/modules/FindFmt.cmake')

diff --git a/cmake/modules/FindFmt.cmake b/cmake/modules/FindFmt.cmake
index 47cf8be..b426d8c 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
@@ -57,12 +59,7 @@ if(ENABLE_INTERNAL_FMT)
 
 else()
 
-if(CORE_SYSTEM_NAME STREQUAL windows OR CORE_SYSTEM_NAME STREQUAL windowsstore)
-  # TODO: fix windows fmt package to include fmt-config.cmake and fmt-config-version.cmake
-  set(FMT_VERSION 3.0.1)
-else()
-  find_package(FMT 3.0.1 CONFIG REQUIRED QUIET)
-endif()
+find_package(FMT 6.1.2 CONFIG REQUIRED QUIET)
 
 if(PKG_CONFIG_FOUND)
   pkg_check_modules(PC_FMT libfmt QUIET)
-- 
cgit v1.2.3