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

tamatebako · Aug 30, 2024 · c1c6621 · c1c6621
1 parent bd91c9d
commit c1c6621
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -347,7 +347,6 @@ endif()
 if(PREFER_SYSTEM_LIBFMT)
   find_package(fmt 10 CONFIG)
 else(PREFER_SYSTEM_LIBFMT)
-  include_directories(${fmt_SOURCE_DIR}/include)
 
   include(FetchContent)
   FetchContent_Declare(
@@ -358,6 +357,12 @@ else(PREFER_SYSTEM_LIBFMT)
   )
   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