From 53f661ece8b43d22a08a3ed97ce37d35fb0e65f2 Mon Sep 17 00:00:00 2001 From: Jordon Brooks Date: Fri, 24 May 2024 21:05:34 +0100 Subject: [PATCH 1/2] Fix fmt not being included in library --- HarmonyLinkLib/CMakeLists.txt | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/HarmonyLinkLib/CMakeLists.txt b/HarmonyLinkLib/CMakeLists.txt index 03440bf..eb67f49 100644 --- a/HarmonyLinkLib/CMakeLists.txt +++ b/HarmonyLinkLib/CMakeLists.txt @@ -92,11 +92,6 @@ set(COMMON_INCLUDES "src/Utilities.h" ) -# Adding fmt headers explicitly -set(FMT_HEADERS - "${fmt_SOURCE_DIR}/include/fmt" -) - set(WINDOWS_SOURCES "src/Platform/Windows/WindowsUtilities.cpp" ) @@ -166,9 +161,6 @@ target_include_directories(HarmonyLinkLibStatic ) target_compile_definitions(HarmonyLinkLibStatic PRIVATE HARMONYLINKLIB_STATIC) -# Include fmt headers -target_include_directories(HarmonyLinkLibStatic PRIVATE ${FMT_HEADERS}) - # Set output directories for all build types foreach(TYPE IN ITEMS DEBUG RELEASE) string(TOUPPER ${TYPE} TYPE_UPPER) @@ -182,8 +174,9 @@ foreach(TYPE IN ITEMS DEBUG RELEASE) ) endforeach() -target_link_libraries(HarmonyLinkLibStatic PRIVATE fmt) -target_link_libraries(HarmonyLinkLibShared PRIVATE fmt) +# Link fmt to HarmonyLinkLib +target_link_libraries(HarmonyLinkLibStatic PRIVATE fmt::fmt-header-only) +target_link_libraries(HarmonyLinkLibShared PRIVATE fmt::fmt-header-only) if (UNIX) target_link_libraries(HarmonyLinkLibStatic PRIVATE stdc++fs) From 810cea013ea74369664f9709e0024d55e8e756f9 Mon Sep 17 00:00:00 2001 From: Jordon Brooks Date: Fri, 24 May 2024 21:08:11 +0100 Subject: [PATCH 2/2] Version Bump --- HarmonyLinkLib/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HarmonyLinkLib/CMakeLists.txt b/HarmonyLinkLib/CMakeLists.txt index eb67f49..7146d8e 100644 --- a/HarmonyLinkLib/CMakeLists.txt +++ b/HarmonyLinkLib/CMakeLists.txt @@ -12,7 +12,7 @@ # limitations under the License. cmake_minimum_required(VERSION 3.10) -project(HarmonyLinkLib VERSION 2.1.1) +project(HarmonyLinkLib VERSION 2.1.2) include(FetchContent)