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

Fix fmt not being included in library

Browse source
This commit is contained in:
Jordon Brooks 2024-05-24 21:05:34 +01:00
parent 7dbe088577
commit 53f661ece8
Signed by: jordon
GPG key ID: DBD9758CD53E786A
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
HarmonyLinkLib/CMakeLists.txt
View file

@ -92,11 +92,6 @@ set(COMMON_INCLUDES
"src/Utilities.h" "src/Utilities.h"
) )
# Adding fmt headers explicitly
set(FMT_HEADERS
"${fmt_SOURCE_DIR}/include/fmt"
)
set(WINDOWS_SOURCES set(WINDOWS_SOURCES
"src/Platform/Windows/WindowsUtilities.cpp" "src/Platform/Windows/WindowsUtilities.cpp"
) )
@ -166,9 +161,6 @@ 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 PRIVATE ${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)
@ -182,8 +174,9 @@ foreach(TYPE IN ITEMS DEBUG RELEASE)
) )
endforeach() endforeach()
target_link_libraries(HarmonyLinkLibStatic PRIVATE fmt) # Link fmt to HarmonyLinkLib
target_link_libraries(HarmonyLinkLibShared PRIVATE fmt) target_link_libraries(HarmonyLinkLibStatic PRIVATE fmt::fmt-header-only)
target_link_libraries(HarmonyLinkLibShared PRIVATE fmt::fmt-header-only)
if (UNIX) if (UNIX)
target_link_libraries(HarmonyLinkLibStatic PRIVATE stdc++fs) target_link_libraries(HarmonyLinkLibStatic PRIVATE stdc++fs)