[Fix] Prioritise bundled simdutf headers over system ones

diff --git a/cmake/AddDependencySubdirectories.cmake b/cmake/AddDependencySubdirectories.cmake
index c00133ecb1866e12282bb63d037ca73a25f70f5e..215024ccb2d07ec97ac0167ca76004277ea34a4b 100644 (file)
--- a/cmake/AddDependencySubdirectories.cmake
+++ b/cmake/AddDependencySubdirectories.cmake
@@ -19,7 +19,7 @@ function(AddDependencySubdirectories)
     add_subdirectory(contrib/lc-btrie)
     add_subdirectory(contrib/libottery)
     add_subdirectory(contrib/simdutf)
-    include_directories("${CMAKE_SOURCE_DIR}/contrib/simdutf/include")
+    include_directories(BEFORE "${CMAKE_SOURCE_DIR}/contrib/simdutf/include")
 
     # Configure zstd
     if (SYSTEM_ZSTD MATCHES "OFF")

diff --git a/contrib/simdutf/src/CMakeLists.txt b/contrib/simdutf/src/CMakeLists.txt
index 7a4a5c93b0a898bda84e63e625ecdaa4378f006d..cc8ba8dc91f50d19eead7b6edae9350a34783e3f 100644 (file)
--- a/contrib/simdutf/src/CMakeLists.txt
+++ b/contrib/simdutf/src/CMakeLists.txt
@@ -4,8 +4,8 @@ add_library(simdutf-source INTERFACE)
 target_sources(simdutf-source INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/simdutf.cpp)
 target_link_libraries(simdutf-source INTERFACE simdutf-include-source)
 add_library(simdutf STATIC simdutf.cpp ../../../src/libutil/cxx/rspamd-simdutf.cxx)
-target_include_directories(simdutf PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> )
-target_include_directories(simdutf PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>")
+target_include_directories(simdutf BEFORE PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> )
+target_include_directories(simdutf BEFORE PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>")
 
 if(MSVC)
   if("${MSVC_TOOLSET_VERSION}" STREQUAL "140")