From 104179591a6c0829e99b4472420145e9bbf7167f Mon Sep 17 00:00:00 2001 From: ClausKlein Date: Tue, 24 Feb 2026 05:53:41 +0100 Subject: [PATCH] Add an option(FMT_IMPORT_STD) after review --- CMakeLists.txt | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2400684e..d407d5cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.30...4.3) +cmake_minimum_required(VERSION 3.8...4.3) include_guard(GLOBAL) # Fallback for using newer policies on CMake <3.12. @@ -75,7 +75,7 @@ function(add_module_library name) if (CMAKE_COMPILER_IS_GNUCXX) target_compile_options(${name} PUBLIC -fmodules-ts) if (CMAKE_VERSION VERSION_GREATER_EQUAL 4.3) - set(FMT_IMPORT_STD ON) + option(FMT_IMPORT_STD "Enable use of import std;" OFF) endif() endif () @@ -89,16 +89,13 @@ function(add_module_library name) "CMAKE_CXX_COMPILER_IMPORT_STD=${CMAKE_CXX_COMPILER_IMPORT_STD}" ) if(${CMAKE_CXX_STANDARD} IN_LIST CMAKE_CXX_COMPILER_IMPORT_STD) - set(CMAKE_CXX_MODULE_STD ON) - set(CMAKE_CXX_SCAN_FOR_MODULES ON) - message(STATUS "CMAKE_CXX_MODULE_STD=${CMAKE_CXX_MODULE_STD}") + message(STATUS "Use FMT_IMPORT_STD=${FMT_IMPORT_STD}") target_compile_definitions(${name} PUBLIC FMT_IMPORT_STD) + message(STATUS "Use CXX_MODULE_STD=ON") set_target_properties(${name} PROPERTIES CXX_MODULE_STD ON) else() - set(CMAKE_CXX_MODULE_STD OFF) - message(WARNING "CMAKE_CXX_MODULE_STD=${CMAKE_CXX_MODULE_STD}") + message(WARNING "CXX_MODULE_STD=OFF") endif() - message(STATUS "FMT_IMPORT_STD=${FMT_IMPORT_STD}") endif() if (FMT_USE_CMAKE_MODULES)