diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index 8313565..ba7ec61 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -19,13 +19,28 @@ set_property(TARGET gtest_static PROPERTY IMPORTED_LOCATION ${VENDOR_BUILD}/lib/ set_property(TARGET gtest_static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${VENDOR_BUILD}/include) set_property(TARGET gtest_static PROPERTY INTERFACE_LINK_LIBRARIES pthread) -execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ${CMAKE_CURRENT_SOURCE_DIR}/boost_1_80_0.tar.gz - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/deps/) +# colm-0.13.0.5 +ExternalProject_Add(colm PREFIX colm + URL ${CMAKE_CURRENT_SOURCE_DIR}/colm-0.13.0.5.tar.gz + CONFIGURE_COMMAND ./autogen.sh && ./configure --prefix=/usr --libdir=/usr/lib64 + BUILD_COMMAND make + INSTALL_COMMAND make install + BUILD_IN_SOURCE 1) + +# ragel-7.0.0.10 +ExternalProject_Add(ragel PREFIX ragel + URL ${CMAKE_CURRENT_SOURCE_DIR}/ragel-7.0.0.10.tar.gz + CONFIGURE_COMMAND ./autogen.sh && ./configure + DEPENDS colm + BUILD_COMMAND make + INSTALL_COMMAND make install + BUILD_IN_SOURCE 1) # HyperScan 5.4.0 ExternalProject_Add(hyperscan PREFIX hyperscan URL ${CMAKE_CURRENT_SOURCE_DIR}/hyperscan-5.4.0.tar.gz - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${VENDOR_BUILD} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBOOST_ROOT=${PROJECT_SOURCE_DIR}/deps/boost_1_80_0 -DCMAKE_C_FLAGS="-fPIC") + DEPENDS ragel + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${VENDOR_BUILD} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_C_FLAGS="-fPIC") ExternalProject_Get_Property(hyperscan INSTALL_DIR) file(MAKE_DIRECTORY ${VENDOR_BUILD}/include) @@ -38,4 +53,4 @@ set_property(TARGET hyperscan_static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${VE add_library(hyperscan_runtime_static STATIC IMPORTED GLOBAL) add_dependencies(hyperscan_runtime_static hyperscan) set_property(TARGET hyperscan_runtime_static PROPERTY IMPORTED_LOCATION ${VENDOR_BUILD}/lib64/libhs_runtime.a) -set_property(TARGET hyperscan_runtime_static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${VENDOR_BUILD}/include) \ No newline at end of file +set_property(TARGET hyperscan_runtime_static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${VENDOR_BUILD}/include) diff --git a/vendor/boost_1_80_0.tar.gz b/vendor/boost_1_80_0.tar.gz deleted file mode 100644 index 2f1dbab..0000000 Binary files a/vendor/boost_1_80_0.tar.gz and /dev/null differ diff --git a/vendor/colm-0.13.0.5.tar.gz b/vendor/colm-0.13.0.5.tar.gz new file mode 100644 index 0000000..51f4f6d Binary files /dev/null and b/vendor/colm-0.13.0.5.tar.gz differ diff --git a/vendor/hyperscan-5.4.0.tar.gz b/vendor/hyperscan-5.4.0.tar.gz index 94a94cf..415858d 100644 Binary files a/vendor/hyperscan-5.4.0.tar.gz and b/vendor/hyperscan-5.4.0.tar.gz differ diff --git a/vendor/ragel-7.0.0.10.tar.gz b/vendor/ragel-7.0.0.10.tar.gz new file mode 100644 index 0000000..d35ea08 Binary files /dev/null and b/vendor/ragel-7.0.0.10.tar.gz differ