fix: ensure bundled fmt includes have priority over system/homebrew i…

…ncludes
tamatebako · Aug 30, 2024 · 1803392 · 1803392
1 parent bd91c9d
commit 1803392
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -346,18 +346,23 @@ endif()
 
 if(PREFER_SYSTEM_LIBFMT)
   find_package(fmt 10 CONFIG)
-else(PREFER_SYSTEM_LIBFMT)
-  include_directories(${fmt_SOURCE_DIR}/include)
-
+else(PREFER_SYSTEM_LIBFMT)  
   include(FetchContent)
+
   FetchContent_Declare(
     fmt
     GIT_REPOSITORY ${LIBFMT_GIT_REPO}
     GIT_TAG 10.2.1
     OVERRIDE_FIND_PACKAGE
   )
   FetchContent_MakeAvailable(fmt)
-
+
+  target_include_directories(fmt BEFORE PUBLIC
+    $<BUILD_INTERFACE:${fmt_SOURCE_DIR}/include>  
+    $<INSTALL_INTERFACE:include>
+  )
+
+  include_directories(BEFORE ${fmt_SOURCE_DIR}/include)
 endif(PREFER_SYSTEM_LIBFMT)
 
 find_package(Boost 1.67 REQUIRED COMPONENTS chrono iostreams program_options)

diff --git a/fbthrift b/fbthrift
diff --git a/folly b/folly