jordon/HarmonyLink
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

Fix FMT library issues

Browse source
This commit is contained in:
Jordon Brooks 2024-05-16 23:51:01 +01:00
parent 5f5e9de474
commit 6f5f8e7076
Signed by: jordon
GPG key ID: DBD9758CD53E786A
1 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

32
HarmonyLinkLib/CMakeLists.txt
View file

@ -16,6 +16,7 @@ project(HarmonyLinkLib VERSION 2.1.0)
include(FetchContent) include(FetchContent)
# Fetch fmt library
FetchContent_Declare( FetchContent_Declare(
fmt fmt
GIT_REPOSITORY https://github.com/fmtlib/fmt.git GIT_REPOSITORY https://github.com/fmtlib/fmt.git
@ -23,11 +24,6 @@ FetchContent_Declare(
) )
FetchContent_MakeAvailable(fmt) FetchContent_MakeAvailable(fmt)
if(NOT fmt_POPULATED)
FetchContent_Populate(fmt)
# Add fmt but exclude it from the ALL target, reducing IDE clutter
add_subdirectory(${fmt_SOURCE_DIR} ${fmt_BINARY_DIR} EXCLUDE_FROM_ALL)
endif()
set_target_properties(fmt PROPERTIES FOLDER External) set_target_properties(fmt PROPERTIES FOLDER External)
set_target_properties(fmt PROPERTIES POSITION_INDEPENDENT_CODE TRUE) set_target_properties(fmt PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
@ -55,7 +51,7 @@ endif()
configure_file(include/Version.h.in Version.generated.h) configure_file(include/Version.h.in Version.generated.h)
# Specify the C++ standard # Specify the C++ standard
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED True) set(CMAKE_CXX_STANDARD_REQUIRED True)
# Define metadata variables # Define metadata variables
@ -96,6 +92,23 @@ set(COMMON_INCLUDES
"src/Utilities.h" "src/Utilities.h"
) )
# Adding fmt headers explicitly
set(FMT_HEADERS
"${fmt_SOURCE_DIR}/include/fmt/args.h"
"${fmt_SOURCE_DIR}/include/fmt/chrono.h"
"${fmt_SOURCE_DIR}/include/fmt/color.h"
"${fmt_SOURCE_DIR}/include/fmt/compile.h"
"${fmt_SOURCE_DIR}/include/fmt/core.h"
"${fmt_SOURCE_DIR}/include/fmt/format.h"
"${fmt_SOURCE_DIR}/include/fmt/format-inl.h"
"${fmt_SOURCE_DIR}/include/fmt/os.h"
"${fmt_SOURCE_DIR}/include/fmt/ostream.h"
"${fmt_SOURCE_DIR}/include/fmt/printf.h"
"${fmt_SOURCE_DIR}/include/fmt/ranges.h"
"${fmt_SOURCE_DIR}/include/fmt/std.h"
"${fmt_SOURCE_DIR}/include/fmt/xchar.h"
)
set(WINDOWS_SOURCES set(WINDOWS_SOURCES
"src/Platform/Windows/WindowsUtilities.cpp" "src/Platform/Windows/WindowsUtilities.cpp"
) )
@ -165,6 +178,9 @@ target_include_directories(HarmonyLinkLibStatic
) )
target_compile_definitions(HarmonyLinkLibStatic PRIVATE HARMONYLINKLIB_STATIC) target_compile_definitions(HarmonyLinkLibStatic PRIVATE HARMONYLINKLIB_STATIC)
# Include fmt headers
target_include_directories(HarmonyLinkLibStatic PUBLIC ${FMT_HEADERS})
# Set output directories for all build types # Set output directories for all build types
foreach(TYPE IN ITEMS DEBUG RELEASE) foreach(TYPE IN ITEMS DEBUG RELEASE)
string(TOUPPER ${TYPE} TYPE_UPPER) string(TOUPPER ${TYPE} TYPE_UPPER)
@ -179,5 +195,5 @@ foreach(TYPE IN ITEMS DEBUG RELEASE)
endforeach() endforeach()
# Link fmt library to both shared and static libraries # Link fmt library to both shared and static libraries
target_link_libraries(HarmonyLinkLibShared PRIVATE fmt::fmt) target_link_libraries(HarmonyLinkLibShared PRIVATE fmt::fmt-header-only)
target_link_libraries(HarmonyLinkLibStatic PRIVATE fmt::fmt) target_link_libraries(HarmonyLinkLibStatic PRIVATE fmt::fmt-header-only)