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

Merge branch 'hotfix/v2.1.2' into Dev

Browse source
This commit is contained in:
Jordon Brooks 2024-05-24 21:09:00 +01:00
commit 47761441c0
Signed by: jordon
GPG key ID: DBD9758CD53E786A
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
HarmonyLinkLib/CMakeLists.txt
View file

@ -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)
@ -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)