Fix build

PHILO-HE · Jul 16, 2024 · 94f464d · 94f464d
1 parent b024cfc
commit 94f464d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -64,7 +64,7 @@ jobs:
           brew install \
             bison boost ccache double-conversion flex fmt gflags glog \
             icu4c libevent libsodium lz4 lzo ninja openssl protobuf@21 \
-            range-v3 simdjson snappy thrift xz xsimd zstd
+            range-v3 simdjson snappy thrift xz xsimd zstd libtool
 
           echo "NJOBS=`sysctl -n hw.ncpu`" >> $GITHUB_ENV
           brew unlink protobuf || echo "protobuf not installed"

diff --git a/CMake/resolve_dependency_modules/hyperscan.cmake b/CMake/resolve_dependency_modules/hyperscan.cmake
@@ -82,4 +82,6 @@ set(CMAKE_CXX_STANDARD 11)
 set(BUILD_EXAMPLES FALSE)
 set(BUILD_AVX512 ON)
 FetchContent_MakeAvailable(hyperscan)
+set_target_properties(hs PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
+                                    ${hyperscan_SOURCE_DIR}/src)
 set(CMAKE_CXX_STANDARD ${CMAKE_CXX_STANDARD_BACKUP})
diff --git a/velox/functions/lib/CMakeLists.txt b/velox/functions/lib/CMakeLists.txt
@@ -40,7 +40,7 @@ add_library(
   TimeUtils.cpp)
 
 target_link_libraries(velox_functions_lib velox_functions_util velox_vector
-                      re2::re2 Folly::folly hyperscan)
+                      re2::re2 Folly::folly hs)
 
 add_subdirectory(aggregates)
 add_subdirectory(string)

diff --git a/velox/functions/lib/HyperscanFunctions.cpp b/velox/functions/lib/HyperscanFunctions.cpp
@@ -15,10 +15,10 @@
  */
 #include "velox/functions/lib/HyperscanFunctions.h"
 #include <errno.h>
-#include <hs/hs.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include "hs.h"
 #include "velox/functions/lib/string/StringImpl.h"
 #include "velox/vector/FunctionVector.h"