coffee/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2026-07-30 16:26:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

The final cleanup

Browse Source
This commit is contained in:
ClausKlein 2026-02-25 10:54:46 +01:00
parent f68b46ff5d
commit fefb9cb350
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -72,17 +72,20 @@ function(add_module_library name)
# Modules require C++20.
target_compile_features(${name} PUBLIC cxx_std_20)
if (CMAKE_COMPILER_IS_GNUCXX)
target_compile_options(${name} PUBLIC -fmodules-ts)
if (CMAKE_COMPILER_IS_GNUCXX OR MSVC)
# XXX target_compile_options(${name} PUBLIC -fmodules-ts)
if (CMAKE_VERSION VERSION_GREATER_EQUAL 4.3)
option(FMT_IMPORT_STD "Enable use of import std;" OFF)
option(FMT_IMPORT_STD "Enable use of `import std;`" OFF)
endif ()
endif ()
if (FMT_USE_CMAKE_MODULES AND FMT_IMPORT_STD)
if (NOT DEFINED CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 23)
endif ()
# -------------------------------------------------------------------------
# Tell CMake that we explicitly want `import std`.
# This will initialize the property on all targets declared after this to 1
# This will set the property CXX_MODULE_STD on target {fmt} to 1
# -------------------------------------------------------------------------
message(
STATUS
@ -90,9 +93,8 @@ function(add_module_library name)
)
if (${CMAKE_CXX_STANDARD} IN_LIST CMAKE_CXX_COMPILER_IMPORT_STD)
message(STATUS "Use FMT_IMPORT_STD=${FMT_IMPORT_STD}")
target_compile_definitions(${name} PUBLIC FMT_IMPORT_STD FMT_USE_FCNTL=0)
message(STATUS "Use CXX_MODULE_STD=ON")
set_target_properties(${name} PROPERTIES CXX_MODULE_STD ON)
message(STATUS "Set target property CXX_MODULE_STD=ON")
else ()
message(WARNING "CXX_MODULE_STD=OFF")
endif ()
@ -483,7 +485,7 @@ if (FMT_INSTALL)
set(INSTALL_FILE_SET)
if (FMT_USE_CMAKE_MODULES)
set(INSTALL_FILE_SET FILE_SET fmt DESTINATION "${FMT_INC_DIR}/fmt" FILE_SET HEADERS)
set(INSTALL_FILE_SET FILE_SET fmt DESTINATION "${FMT_INC_DIR}/fmt" FILE_SET HEADERS)
endif ()
# Install the library and headers.

14
test/CMakeLists.txt
View File

@ -1,3 +1,8 @@
enable_language(C)
add_executable(c-test c-test.c)
target_link_libraries(c-test PRIVATE fmt::fmt-c)
add_test(NAME c-test COMMAND c-test)
if (FMT_MODULE)
message(WARNING "Testing is incompatible with build mode 'module'.")
return ()
@ -113,9 +118,9 @@ if (NOT DEFINED MSVC_STATIC_RUNTIME AND MSVC)
if (${flag_var} MATCHES "^(/|-)(MT|MTd)")
set(MSVC_STATIC_RUNTIME ON)
break()
endif()
endif ()
endforeach()
endif()
endif ()
if (NOT MSVC_STATIC_RUNTIME)
add_executable(posix-mock-test
@ -243,8 +248,3 @@ if (FMT_CUDA_TEST)
add_test(NAME cuda-test COMMAND fmt-in-cuda-test)
endif ()
endif ()
enable_language(C)
add_executable(c-test c-test.c)
target_link_libraries(c-test PRIVATE fmt::fmt-c)
add_test(NAME c-test COMMAND c-test)