feat update
Some checks failed
android / build (push) Successful in 1m40s
linux-aarch64-cpu-gcc / linux-gcc-aarch64 (Release) (push) Successful in 3m13s
linux-arm-gcc / linux-gcc-arm (Debug) (push) Successful in 3m11s
linux-arm-gcc / linux-gcc-arm (Release) (push) Successful in 3m44s
linux-mips-gcc / linux-gcc-mipsel (Release) (push) Successful in 3m21s
linux-mips-gcc / linux-gcc-mipsel (Debug) (push) Failing after 4m55s
linux-aarch64-cpu-gcc / linux-gcc-aarch64 (Debug) (push) Successful in 5m9s
linux-mips64-gcc / linux-gcc-mips64el (Release) (push) Failing after 4m21s
linux-x64-gcc / linux-gcc (Debug) (push) Successful in 2m38s
linux-x64-gcc / linux-gcc (Release) (push) Successful in 2m38s
linux-mips64-gcc / linux-gcc-mips64el (Debug) (push) Failing after 5m8s
linux-arm-gcc / linux-gcc-armhf (Release) (push) Successful in 9m15s
linux-riscv64-gcc / linux-gcc-riscv64 (Release) (push) Successful in 4m37s
linux-riscv64-gcc / linux-gcc-riscv64 (Debug) (push) Failing after 6m30s
linux-arm-gcc / linux-gcc-armhf (Debug) (push) Successful in 10m26s
linux-x86-gcc / linux-gcc (Debug) (push) Successful in 5m34s
linux-x86-gcc / linux-gcc (Release) (push) Successful in 5m25s

This commit is contained in:
tqcq 2024-06-11 19:26:15 +08:00
parent 8a2269814d
commit f0ac541bbf
2 changed files with 301 additions and 218 deletions

View File

@ -187,14 +187,16 @@ set(TILE_SRCS
# "tile/rpc/server.cc"
)
list(APPEND ASM_SRCS "tile/fiber/detail/asm/ucontext_aarch64.S"
list(
APPEND
ASM_SRCS
"tile/fiber/detail/asm/ucontext_aarch64.S"
"tile/fiber/detail/asm/ucontext_arm.S"
"tile/fiber/detail/asm/ucontext_riscv64.S"
"tile/fiber/detail/asm/ucontext_mips64.S"
"tile/fiber/detail/asm/ucontext_mips32.S"
"tile/fiber/detail/asm/ucontext_x64.S"
"tile/fiber/detail/asm/ucontext_x86.S"
)
"tile/fiber/detail/asm/ucontext_x86.S")
set_source_files_properties(${ASM_SRCS} PROPERTIES LANGUAGE C)
if((NOT TILE_HAVE_GETIFADDRS) OR (NOT TILE_HAVE_FREEIFADDRS))
@ -220,10 +222,9 @@ target_link_libraries(
PUBLIC # -Wl,--start-group
zlib gflags::gflags glog::glog
# -Wl,--end-group
libcurl fmt::fmt Threads::Threads)
if(
(CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64") OR
(CMAKE_SYSTEM_PROCESSOR MATCHES "mips*"))
libcurl fmt Threads::Threads)
if((CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64") OR (CMAKE_SYSTEM_PROCESSOR MATCHES
"mips*"))
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_link_libraries(tile PUBLIC atomic)
endif()

View File

@ -5,8 +5,8 @@ if (${CMAKE_VERSION} VERSION_LESS 3.12)
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
endif()
# Determine if fmt is built as a subproject (using add_subdirectory)
# or if it is the master project.
# Determine if fmt is built as a subproject (using add_subdirectory) or if it is
# the master project.
if(NOT DEFINED FMT_MASTER_PROJECT)
set(FMT_MASTER_PROJECT OFF)
if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
@ -21,14 +21,17 @@ function(join result_var)
foreach(arg ${ARGN})
set(result "${result}${arg}")
endforeach()
set(${result_var} "${result}" PARENT_SCOPE)
set(${result_var}
"${result}"
PARENT_SCOPE)
endfunction()
# DEPRECATED! Should be merged into add_module_library.
function(enable_module target)
if(MSVC)
set(BMI ${CMAKE_CURRENT_BINARY_DIR}/${target}.ifc)
target_compile_options(${target}
target_compile_options(
${target}
PRIVATE /interface /ifcOutput ${BMI}
INTERFACE /reference fmt=${BMI})
set_target_properties(${target} PROPERTIES ADDITIONAL_CLEAN_FILES ${BMI})
@ -36,13 +39,12 @@ function(enable_module target)
endif()
endfunction()
# Adds a library compiled with C++20 module support.
# `enabled` is a CMake variables that specifies if modules are enabled.
# If modules are disabled `add_module_library` falls back to creating a
# non-modular library.
# Adds a library compiled with C++20 module support. `enabled` is a CMake
# variables that specifies if modules are enabled. If modules are disabled
# `add_module_library` falls back to creating a non-modular library.
#
# Usage:
# add_module_library(<name> [sources...] FALLBACK [sources...] [IF enabled])
# Usage: add_module_library(<name> [sources...] FALLBACK [sources...] [IF
# enabled])
function(add_module_library name)
cmake_parse_arguments(AML "" "IF" "FALLBACK" ${ARGN})
set(sources ${AML_UNPARSED_ARGUMENTS})
@ -75,14 +77,14 @@ function(add_module_library name)
target_compile_options(
${name} PUBLIC -fmodule-file=${CMAKE_CURRENT_BINARY_DIR}/${pcm})
# Use an absolute path to prevent target_link_libraries prepending -l
# to it.
# Use an absolute path to prevent target_link_libraries prepending -l to
# it.
set(pcms ${pcms} ${CMAKE_CURRENT_BINARY_DIR}/${pcm})
add_custom_command(
OUTPUT ${pcm}
COMMAND ${CMAKE_CXX_COMPILER}
-std=c++${std} -x c++-module --precompile -c
-o ${pcm} ${CMAKE_CURRENT_SOURCE_DIR}/${src}
COMMAND
${CMAKE_CXX_COMPILER} -std=c++${std} -x c++-module --precompile -c -o
${pcm} ${CMAKE_CURRENT_SOURCE_DIR}/${src}
"-I$<JOIN:$<TARGET_PROPERTY:${name},INCLUDE_DIRECTORIES>,;-I>"
# Required by the -I generator expression above.
COMMAND_EXPAND_LISTS
@ -109,8 +111,8 @@ endfunction()
include(CMakeParseArguments)
# Sets a cache variable with a docstring joined from multiple arguments:
# set(<variable> <value>... CACHE <type> <docstring>...)
# This allows splitting a long docstring for readability.
# set(<variable> <value>... CACHE <type> <docstring>...) This allows splitting a
# long docstring for readability.
function(set_verbose)
# cmake_parse_arguments is broken in CMake 3.4 (cannot parse CACHE) so use
# list instead.
@ -122,21 +124,25 @@ function(set_verbose)
list(GET ARGN 0 type)
list(REMOVE_AT ARGN 0)
join(doc ${ARGN})
set(${var} ${val} CACHE ${type} ${doc})
set(${var}
${val}
CACHE ${type} ${doc})
endfunction()
# Set the default CMAKE_BUILD_TYPE to Release.
# This should be done before the project command since the latter can set
# CMAKE_BUILD_TYPE itself (it does so for nmake).
# Set the default CMAKE_BUILD_TYPE to Release. This should be done before the
# project command since the latter can set CMAKE_BUILD_TYPE itself (it does so
# for nmake).
if(FMT_MASTER_PROJECT AND NOT CMAKE_BUILD_TYPE)
set_verbose(CMAKE_BUILD_TYPE Release CACHE STRING
set_verbose(
CMAKE_BUILD_TYPE Release CACHE STRING
"Choose the type of build, options are: None(CMAKE_CXX_FLAGS or "
"CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.")
endif()
project(FMT CXX)
include(GNUInstallDirs)
set_verbose(FMT_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE STRING
set_verbose(
FMT_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE STRING
"Installation directory for include files, a relative path that "
"will be joined with ${CMAKE_INSTALL_PREFIX} or an absolute path.")
@ -195,33 +201,53 @@ include(JoinPaths)
if(FMT_MASTER_PROJECT AND NOT DEFINED CMAKE_CXX_VISIBILITY_PRESET)
set_verbose(CMAKE_CXX_VISIBILITY_PRESET hidden CACHE STRING
"Preset for the export of private symbols")
set_property(CACHE CMAKE_CXX_VISIBILITY_PRESET PROPERTY STRINGS
hidden default)
set_property(CACHE CMAKE_CXX_VISIBILITY_PRESET PROPERTY STRINGS hidden
default)
endif()
if(FMT_MASTER_PROJECT AND NOT DEFINED CMAKE_VISIBILITY_INLINES_HIDDEN)
set_verbose(CMAKE_VISIBILITY_INLINES_HIDDEN ON CACHE BOOL
set_verbose(
CMAKE_VISIBILITY_INLINES_HIDDEN ON CACHE BOOL
"Whether to add a compile flag to hide symbols of inline functions")
endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
set(PEDANTIC_COMPILE_FLAGS -pedantic-errors -Wall -Wextra -pedantic
-Wold-style-cast -Wundef
-Wredundant-decls -Wwrite-strings -Wpointer-arith
-Wcast-qual -Wformat=2 -Wmissing-include-dirs
set(PEDANTIC_COMPILE_FLAGS
-pedantic-errors
-Wall
-Wextra
-pedantic
-Wold-style-cast
-Wundef
-Wredundant-decls
-Wwrite-strings
-Wpointer-arith
-Wcast-qual
-Wformat=2
-Wmissing-include-dirs
-Wcast-align
-Wctor-dtor-privacy -Wdisabled-optimization
-Winvalid-pch -Woverloaded-virtual
-Wconversion -Wundef
-Wno-ctor-dtor-privacy -Wno-format-nonliteral)
-Wctor-dtor-privacy
-Wdisabled-optimization
-Winvalid-pch
-Woverloaded-virtual
-Wconversion
-Wundef
-Wno-ctor-dtor-privacy
-Wno-format-nonliteral)
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS}
-Wno-dangling-else -Wno-unused-local-typedefs)
set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wno-dangling-else
-Wno-unused-local-typedefs)
endif()
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wdouble-promotion
-Wtrampolines -Wzero-as-null-pointer-constant -Wuseless-cast
-Wvector-operation-performance -Wsized-deallocation -Wshadow)
set(PEDANTIC_COMPILE_FLAGS
${PEDANTIC_COMPILE_FLAGS}
-Wdouble-promotion
-Wtrampolines
-Wzero-as-null-pointer-constant
-Wuseless-cast
-Wvector-operation-performance
-Wsized-deallocation
-Wshadow)
endif()
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
set(PEDANTIC_COMPILE_FLAGS ${PEDANTIC_COMPILE_FLAGS} -Wshift-overflow=2
@ -231,8 +257,15 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(PEDANTIC_COMPILE_FLAGS -Wall -Wextra -pedantic -Wconversion -Wundef
-Wdeprecated -Wweak-vtables -Wshadow
set(PEDANTIC_COMPILE_FLAGS
-Wall
-Wextra
-pedantic
-Wconversion
-Wundef
-Wdeprecated
-Wweak-vtables
-Wshadow
-Wno-gnu-zero-variadic-macro-arguments)
check_cxx_compiler_flag(-Wzero-as-null-pointer-constant HAS_NULLPTR_WARNING)
if(HAS_NULLPTR_WARNING)
@ -248,10 +281,10 @@ if (MSVC)
endif()
if(FMT_MASTER_PROJECT AND CMAKE_GENERATOR MATCHES "Visual Studio")
# If Microsoft SDK is installed create script run-msbuild.bat that
# calls SetEnv.cmd to set up build environment and runs msbuild.
# It is useful when building Visual Studio projects with the SDK
# toolchain rather than Visual Studio.
# If Microsoft SDK is installed create script run-msbuild.bat that calls
# SetEnv.cmd to set up build environment and runs msbuild. It is useful when
# building Visual Studio projects with the SDK toolchain rather than Visual
# Studio.
include(FindSetEnv)
if(WINSDK_SETENV)
set(MSBUILD_SETUP "call \"${WINSDK_SETENV}\"")
@ -260,7 +293,9 @@ if (FMT_MASTER_PROJECT AND CMAKE_GENERATOR MATCHES "Visual Studio")
join(netfxpath
"C:\\Program Files\\Reference Assemblies\\Microsoft\\Framework\\"
".NETFramework\\v4.0")
file(WRITE run-msbuild.bat "
file(
WRITE run-msbuild.bat
"
${MSBUILD_SETUP}
${CMAKE_MAKE_PROGRAM} -p:FrameworkPathOverride=\"${netfxpath}\" %*")
endif()
@ -270,21 +305,42 @@ function(add_headers VAR)
foreach(header ${ARGN})
set(headers ${headers} include/fmt/${header})
endforeach()
set(${VAR} ${headers} PARENT_SCOPE)
set(${VAR}
${headers}
PARENT_SCOPE)
endfunction()
# Define the fmt library, its includes and the needed defines.
add_headers(FMT_HEADERS args.h chrono.h color.h compile.h core.h format.h
format-inl.h os.h ostream.h printf.h ranges.h std.h
add_headers(
FMT_HEADERS
args.h
chrono.h
color.h
compile.h
core.h
format.h
format-inl.h
os.h
ostream.h
printf.h
ranges.h
std.h
xchar.h)
set(FMT_SOURCES src/format.cc)
if(FMT_OS)
set(FMT_SOURCES ${FMT_SOURCES} src/os.cc)
endif()
add_module_library(fmt src/fmt.cc FALLBACK
${FMT_SOURCES} ${FMT_HEADERS} README.md ChangeLog.md
IF FMT_MODULE)
add_module_library(
fmt
src/fmt.cc
FALLBACK
${FMT_SOURCES}
${FMT_HEADERS}
README.md
ChangeLog.md
IF
FMT_MODULE)
add_library(fmt::fmt ALIAS fmt)
if(FMT_MODULE)
enable_module(fmt)
@ -303,20 +359,26 @@ else ()
message(WARNING "Feature cxx_std_11 is unknown for the CXX compiler")
endif()
target_include_directories(fmt ${FMT_SYSTEM_HEADERS_ATTRIBUTE} PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
target_include_directories(
fmt ${FMT_SYSTEM_HEADERS_ATTRIBUTE}
PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:${FMT_INC_DIR}>)
set(FMT_DEBUG_POSTFIX d CACHE STRING "Debug library postfix.")
set(FMT_DEBUG_POSTFIX
d
CACHE STRING "Debug library postfix.")
set_target_properties(fmt PROPERTIES
VERSION ${FMT_VERSION} SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}
set_target_properties(
fmt
PROPERTIES VERSION ${FMT_VERSION}
SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}
PUBLIC_HEADER "${FMT_HEADERS}"
DEBUG_POSTFIX "${FMT_DEBUG_POSTFIX}"
# Workaround for Visual Studio 2017:
# Ensure the .pdb is created with the same name and in the same directory
# as the .lib. Newer VS versions already do this by default, but there is no
# Ensure the .pdb is created with the same name and in the same
# directory
# as the .lib. Newer VS versions already do this by default, but
# there is no
# harm in setting it for those too. Ignored by other generators.
COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
COMPILE_PDB_NAME "fmt"
@ -330,7 +392,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
endif()
if(BUILD_SHARED_LIBS)
target_compile_definitions(fmt PRIVATE FMT_LIB_EXPORT INTERFACE FMT_SHARED)
target_compile_definitions(
fmt
PRIVATE FMT_LIB_EXPORT
INTERFACE FMT_SHARED)
endif()
if(FMT_SAFE_DURATION_CAST)
target_compile_definitions(fmt PUBLIC FMT_SAFE_DURATION_CAST)
@ -342,15 +407,19 @@ add_library(fmt::fmt-header-only ALIAS fmt-header-only)
target_compile_definitions(fmt-header-only INTERFACE FMT_HEADER_ONLY=1)
target_compile_features(fmt-header-only INTERFACE cxx_std_11)
target_include_directories(fmt-header-only
${FMT_SYSTEM_HEADERS_ATTRIBUTE} INTERFACE
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
target_include_directories(
fmt-header-only ${FMT_SYSTEM_HEADERS_ATTRIBUTE}
INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:${FMT_INC_DIR}>)
# Install targets.
if(FMT_INSTALL)
include(CMakePackageConfigHelpers)
set_verbose(FMT_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/fmt CACHE STRING
set_verbose(
FMT_CMAKE_DIR
${CMAKE_INSTALL_LIBDIR}/cmake/fmt
CACHE
STRING
"Installation directory for cmake files, a relative path that "
"will be joined with ${CMAKE_INSTALL_PREFIX} or an absolute "
"path.")
@ -359,11 +428,16 @@ if (FMT_INSTALL)
set(pkgconfig ${PROJECT_BINARY_DIR}/fmt.pc)
set(targets_export_name fmt-targets)
set_verbose(FMT_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE STRING
set_verbose(
FMT_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE STRING
"Installation directory for libraries, a relative path that "
"will be joined to ${CMAKE_INSTALL_PREFIX} or an absolute path.")
set_verbose(FMT_PKGCONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig CACHE STRING
set_verbose(
FMT_PKGCONFIG_DIR
${CMAKE_INSTALL_LIBDIR}/pkgconfig
CACHE
STRING
"Installation directory for pkgconfig (.pc) files, a relative "
"path that will be joined with ${CMAKE_INSTALL_PREFIX} or an "
"absolute path.")
@ -377,19 +451,18 @@ if (FMT_INSTALL)
join_paths(libdir_for_pc_file "\${exec_prefix}" "${FMT_LIB_DIR}")
join_paths(includedir_for_pc_file "\${prefix}" "${FMT_INC_DIR}")
configure_file(
"${PROJECT_SOURCE_DIR}/support/cmake/fmt.pc.in"
"${pkgconfig}"
configure_file("${PROJECT_SOURCE_DIR}/support/cmake/fmt.pc.in" "${pkgconfig}"
@ONLY)
configure_package_config_file(
${PROJECT_SOURCE_DIR}/support/cmake/fmt-config.cmake.in
${project_config}
${PROJECT_SOURCE_DIR}/support/cmake/fmt-config.cmake.in ${project_config}
INSTALL_DESTINATION ${FMT_CMAKE_DIR})
set(INSTALL_TARGETS fmt fmt-header-only)
# Install the library and headers.
install(TARGETS ${INSTALL_TARGETS} EXPORT ${targets_export_name}
install(
TARGETS ${INSTALL_TARGETS}
EXPORT ${targets_export_name}
LIBRARY DESTINATION ${FMT_LIB_DIR}
ARCHIVE DESTINATION ${FMT_LIB_DIR}
PUBLIC_HEADER DESTINATION "${FMT_INC_DIR}/fmt"
@ -397,14 +470,17 @@ if (FMT_INSTALL)
# Use a namespace because CMake provides better diagnostics for namespaced
# imported targets.
export(TARGETS ${INSTALL_TARGETS} NAMESPACE fmt::
export(
TARGETS ${INSTALL_TARGETS}
NAMESPACE fmt::
FILE ${PROJECT_BINARY_DIR}/${targets_export_name}.cmake)
# Install version, config and target files.
install(
FILES ${project_config} ${version_config}
install(FILES ${project_config} ${version_config}
DESTINATION ${FMT_CMAKE_DIR})
install(EXPORT ${targets_export_name} DESTINATION ${FMT_CMAKE_DIR}
install(
EXPORT ${targets_export_name}
DESTINATION ${FMT_CMAKE_DIR}
NAMESPACE fmt::)
install(FILES "${pkgconfig}" DESTINATION "${FMT_PKGCONFIG_DIR}")
@ -423,11 +499,11 @@ endif ()
if(FMT_FUZZ)
add_subdirectory(test/fuzzing)
# The FMT_FUZZ macro is used to prevent resource exhaustion in fuzzing
# mode and make fuzzing practically possible. It is similar to
# FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION but uses a different name to
# avoid interfering with fuzzing of projects that use {fmt}.
# See also https://llvm.org/docs/LibFuzzer.html#fuzzer-friendly-build-mode.
# The FMT_FUZZ macro is used to prevent resource exhaustion in fuzzing mode
# and make fuzzing practically possible. It is similar to
# FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION but uses a different name to avoid
# interfering with fuzzing of projects that use {fmt}. See also
# https://llvm.org/docs/LibFuzzer.html#fuzzer-friendly-build-mode.
target_compile_definitions(fmt PUBLIC FMT_FUZZ)
endif()
@ -441,8 +517,14 @@ if (FMT_MASTER_PROJECT AND EXISTS ${gitignore})
string(REPLACE "*" ".*" line "${line}")
set(ignored_files ${ignored_files} "${line}$" "${line}/")
endforeach()
set(ignored_files ${ignored_files}
/.git /breathe /format-benchmark sphinx/ .buildinfo .doctrees)
set(ignored_files
${ignored_files}
/.git
/breathe
/format-benchmark
sphinx/
.buildinfo
.doctrees)
set(CPACK_SOURCE_GENERATOR ZIP)
set(CPACK_SOURCE_IGNORE_FILES ${ignored_files})