From 170d4b9fb895fa723b60e797a8ac1d2145e33eab Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Wed, 31 Dec 2025 17:36:53 +1000
Subject: [PATCH] Build: Don't make fast_float a public link for libraries

---
 dep/rapidyaml/CMakeLists.txt | 1 +
 src/common/CMakeLists.txt    | 4 ++--
 src/common/common.props      | 2 +-
 src/common/common.vcxproj    | 1 +
 src/core/core.vcxproj        | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dep/rapidyaml/CMakeLists.txt b/dep/rapidyaml/CMakeLists.txt
index a7244eb19..87f175f6a 100644
--- a/dep/rapidyaml/CMakeLists.txt
+++ b/dep/rapidyaml/CMakeLists.txt
@@ -73,3 +73,4 @@ target_compile_definitions(rapidyaml PUBLIC
   "C4_NO_DEBUG_BREAK"
 )
 
+target_link_libraries(rapidyaml PUBLIC fast_float)
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 0fd112b79..c11eeb384 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -76,8 +76,8 @@ add_library(common
 )
 
 target_include_directories(common PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
-target_link_libraries(common PUBLIC fmt Threads::Threads fast_float)
-target_link_libraries(common PRIVATE "${CMAKE_DL_LIBS}")
+target_link_libraries(common PUBLIC fmt Threads::Threads)
+target_link_libraries(common PRIVATE fast_float "${CMAKE_DL_LIBS}")
 
 if(WIN32)
   target_sources(common PRIVATE
diff --git a/src/common/common.props b/src/common/common.props
index 7b7eddb33..e3ffd9ef3 100644
--- a/src/common/common.props
+++ b/src/common/common.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src;%(AdditionalIncludeDirectories);$(SolutionDir)dep\fast_float\include;$(SolutionDir)dep\fmt\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)src;$(SolutionDir)dep\fmt\include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);FMT_EXCEPTIONS=0;FMT_USE_RTTI=0;FMT_CPP_LIB_FILESYSTEM=0</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index a379624c5..9f3534e97 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -126,6 +126,7 @@
   <Import Project="common.props" />
   <ItemDefinitionGroup>
     <ClCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)dep\fast_float\include;</AdditionalIncludeDirectories>
       <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
     </ClCompile>
   </ItemDefinitionGroup>
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index c53b19ec3..550a1d13b 100644
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@@ -215,6 +215,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions Condition="'$(Platform)'=='x64' And ($(Configuration.Contains('Debug')) Or $(Configuration.Contains('Devel')))">ZYDIS_DISABLE_ENCODER;ZYDIS_DISABLE_AVX512;ZYDIS_DISABLE_KNC;ZYDIS_STATIC_BUILD;ZYCORE_STATIC_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)dep\fast_float\include;</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64' And ($(Configuration.Contains('Debug')) Or $(Configuration.Contains('Devel')))">%(AdditionalIncludeDirectories);$(SolutionDir)dep\zydis\include;$(SolutionDir)dep\zydis\dependencies\zycore\include</AdditionalIncludeDirectories>
       <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
       <PrecompiledHeader>Use</PrecompiledHeader>